Fixed a few warnings with picky compilers