Typo and similar fixes