- Fix MSVC build based on ThFabba suggestion