Hush various warnings
Merge pull request #735 from afuna/hush-various-warnings

Hush various warnings