Typos are fixed
Merge branch 'hotfix/typos'