Typos

Replacement for #2048 Fixed merge error.