Grammar fixes
Merge branch 'test_grammar'