Minor cleanup of typos.

rebases a commit from #1155