Fix typos found by Fred
Merge branch 'fix-typos' into v2.2-latest

Fixes typos found by Fred