[Parser] More bugs fixed