Fix various discrepancies in grammar