Fix typos.
Merge pull request #832 from waywardmonkeys/typo-fixes

Fix typos.