fix warnings
Merge pull request #5928 from skv-headless/master

Fix warnings