Warning fixes
Merge pull request #1155 from bitwangyaoyao:master_fix