RE: More MSVC fixes