(360) More 360/MSVC fixes