typo fixes in WIP 4375