More MSVC fixes related to 0fc0c65