Fixes about VS toolchain