[Parser] Fixed a few bugs