Some bug fixes

I fix some bugs in syntax analyser.