Fixup grammar