Fix issues with the grammar.