First steps towards MSVC compatibility