Merged typo fixes to master.