Backport c9331b0916e6a8764ae9b6e559a1ca11676965de
Fix typos