Spelling fixes

(Yes, I mean to merge into master this time)