Some changes in parser.yy