Fixes in the grammar