Fix typos found by Fred
Merge branch 'fix-typos'

Fixes typos found by Fred.