Typo fixes

[merge]