Builds with MSVC again