More changes to the yacc file