More warning fixes.
Merge pull request #4848 from dumganhar/more-warning-fixes

More warning fixes.