Typo fixes and minor fixes