Fixes misc grammar issues

Fixes #2710