Fixing issues in parser.mly