(MSVC) Compatibility fixes