Grammar fixups