Fix typos and other trivial cleanup
Merge pull request #4159 from mlepage/develop

[ci skip]Fix typos and other trivial cleanup