[FOLD] msvc fixes