fix some code typos
Merge branch 'hotfix/0'