Misc fixes (mainly spelling)