Some warning fixes.
Merge pull request #4658 from dumganhar/develop

Some warning fixes.