fix typos (2.0)

Backport changes to 2.0 (#2084).