Fix MSVC build (1/2)
Fix MSVC build (2/2)