Fix minor typos
(cherry picked from commit 0b5c033ba709562a07391e2e5f9bc480538fcf98)
backport to 5.12 LTS