Fixes to last updated grammar