Some fixes in grammar.