Typo and misc fixes