Fix typos
Merge branch 'bug-18146-fixtypos'