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

Fix typos