fix warnings
Merge pull request #7411 from minggo/warning-fix

fix warnings