Fixed typos

Noticed a few typos reading through the source.
Merge pull request #2391 from baweaver/patch-1

Fixed typos