More warning cleanups
Merge pull request #322 from chinhodado/master

More warning cleanups