Fix a few typos.
Merge branch 'fix-typos'

* fix-typos:
  Fix a few typos.