Integrated typo fixes from pull request