Some MSVC build adjustments