MOAR gramatical fixes