Made some changes to try to fix MSVC_build