Some fixes to grammar stuff