Some fixes to grammar