Fix remaining warnings
Merge pull request #1110 from igorko/master

Fix remaining warnings