Fix two warnings: remove unused variable, modify a typo
Merge branch 'develop-JinSun'