Working on MSVC build