Grammar fixes proposed by @weaverryan and @WouterJ