Fix more typos.
Merge branch 'bugfix-more-typos'