Fix some compiler warnings
Get rid of lots of more compiler warnings