fix some warnings
Merge pull request #4444 from minggo/fix-warning

fix some warnings