Grammar improvements