Various typo and error fixes