Spelling fixes (patch by ka7, #890, rebased on top of master)