MSVC build stuff 2