Fixed typos (2.1)

Backport changes to 2.1 (#2084).