Various typo fixes, etc