Fix small typos in comments and error messages

Rebased-From: 67b2d819cdf6181e7f016e5366ce7479830893bd
Github-Pull: #5404