Spelling

Please feel free to squish/drop things.

I've included two changes which are actually fixed in upstream and the commits include the upstream pointer. You could instead import a newer upstream which fixes the errors...