Re-apply typo fixes from c4a6f826b3676d1fdbd99