Some warning fixes on linux.
Merge pull request #4696 from dumganhar/warning-fix

Some warning fixes on linux.