Fix some warnings instead of suppressing them
Merge pull request #333 from allending/fix-warnings

Fix some warnings instead of suppressing them