Typo and error fixes