More fixes to the grammar