Fixes made during msvc building