Grammar fixup