fix warnings
Merge pull request #7222 from minggo/warnings-fix

fix warnings