Cleanup warnings
Merge pull request #404 from lucidd/warnings

Cleanup warnings