Fixing various compiler warnings

Shouldn't affect behavior of code