Merge pull request #968 from alex/typo-fixes

Fix some typos.