Misc warning cleanup 1/2

I'm cleaning up the build for those simple warnings.

I'll submit another pull request later, thanks.