Minor fixes reported by Mark (rebased onto develop)



This is the same as gh-357 but rebased onto develop.

----

Fix typos reported in #354