minor cleanup of typos (rebase)

rebases a commit from #1155