Fix some warnings that are failing VC++ builds