Fix some bugs in Parser