[FIX] Visual Studio fixes