More MSVC fixes.