Start of MSVC compatibility work