Typos

a repeat of #390 against the dev branch