Fix some typos.
Merge pull request #3061 from waywardmonkeys/fix-typos

Fix some typos.