MSVC compatibility improved