Fix 2 typos
(cherry picked from commit d279677)
Fix typo
(cherry picked from commit 880aed7)