Changes for msvc building