Typo fixes and updates
(cherry picked from commit 5a2ca7502fab1cd32ffc36a9275f1445d1cb597d)