Some bugs fixed

No match.