Spelling fixes

The first commit is actually a code fix...