Cleanup warnings
Merge pull request #386 from lucidd/cleanup_warnings

Cleanup warnings