Fix typos
Merge branch 'typos' into 1.7.1