diff --git a/build.sh b/build.sh
index 0e39b18..802826b 100755
--- a/build.sh
+++ b/build.sh
@@ -19,8 +19,8 @@ echo "JAVA_SRC_DIR=${JAVA_SRC_DIR}"
 # ====== Cleanup
 
 # ====== Environment setup
-mkdir $TD_BUILD_DIR || true
-mkdir $TDNATIVES_CPP_BUILD_DIR || true
+[ -d $TD_BUILD_DIR ] || mkdir $TD_BUILD_DIR
+[ -d $TDNATIVES_CPP_BUILD_DIR ] || mkdir $TDNATIVES_CPP_BUILD_DIR
 
 # ====== Build Td
 cd $TD_BUILD_DIR
diff --git a/travis/deploy_master.sh b/travis/deploy_master.sh
index abfb3f6..4f082d2 100644
--- a/travis/deploy_master.sh
+++ b/travis/deploy_master.sh
@@ -17,7 +17,7 @@ echo "TD_BIN_DIR=${TD_BIN_DIR}"
 echo "JAVA_SRC_DIR=${JAVA_SRC_DIR}"
 
 if [ "$TRAVIS_OS_NAME" = "windows" ]; then
-    export PATH="$PATH:/c/Program Files/OpenJDK/openjdk-11.0.8_10/bin:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools"
+	export PATH="$PATH:/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64:/c/Program Files/OpenJDK/openjdk-11.0.8_10/bin:/c/Program Files/CMake/bin:/c/ProgramData/chocolatey/bin:/c/Program Files/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools:/c/Program Files/NASM"
     export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.8_10"
     export JAVA_INCLUDE_PATH="/c/Program Files/OpenJDK/openjdk-11.0.8_10/include"
 else
@@ -91,12 +91,12 @@ if ! (git diff --exit-code "src/main/resources/libs/$TRAVIS_OS_NAME_SHORT/$TRAVI
 
     # Upgrade the dependency of tdlight-java
     cd $TRAVIS_BUILD_DIR
-	rm -r tdlight-java || true
+	[ -d tdlight-java ] && rm -r tdlight-java
     git clone --depth=1 -b master --single-branch git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git
 	cd $TRAVIS_BUILD_DIR/tdlight-java
 	git checkout master
     mvn versions:use-latest-releases -Dincludes=it.tdlight:tdlight-natives-$TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD
-    rm pom.xml.versionsBackup
+    [ -f pom.xml.versionsBackup ] && rm pom.xml.versionsBackup
     git add pom.xml
     git commit -m "Upgrade $TRAVIS_OS_NAME_STANDARD-$TRAVIS_CPU_ARCH_STANDARD natives"
     git push
@@ -116,7 +116,7 @@ if [ "$TRAVIS_OS_NAME_STANDARD" = "linux" ]; then
         
    		# Upgrade the file of tdlight-java
 		cd $TRAVIS_BUILD_DIR
-		rm -r tdlight-java || true
+		[ -d tdlight-java ] && rm -r tdlight-java
     	git clone --depth=1 -b master --single-branch git@ssh.git.ignuranza.net:tdlight-team/tdlight-java.git
         cd $TRAVIS_BUILD_DIR/tdlight-java
 		git checkout master
diff --git a/travis/linux.sh b/travis/linux.sh
index becee45..28ef193 100644
--- a/travis/linux.sh
+++ b/travis/linux.sh
@@ -17,9 +17,9 @@ echo "TD_BIN_DIR=${TD_BIN_DIR}"
 echo "JAVA_SRC_DIR=${JAVA_SRC_DIR}"
 
 # ====== Environment setup
-mkdir -p $TRAVIS_BUILD_DIR/out || true
-mkdir $TD_BUILD_DIR || true
-mkdir $TDNATIVES_CPP_BUILD_DIR || true
+[ -d $TRAVIS_BUILD_DIR/out ] || mkdir -p $TRAVIS_BUILD_DIR/out
+[ -d $TD_BUILD_DIR ] || mkdir $TD_BUILD_DIR
+[ -d $TDNATIVES_CPP_BUILD_DIR ] || mkdir $TDNATIVES_CPP_BUILD_DIR
 
 # Install java and fix java paths
 if [ "$TRAVIS_CPU_ARCH" = "aarch64" ]; then
diff --git a/travis/win.sh b/travis/win.sh
index ee2fd2b..0256d7a 100644
--- a/travis/win.sh
+++ b/travis/win.sh
@@ -17,20 +17,20 @@ echo "TD_BIN_DIR=${TD_BIN_DIR}"
 echo "JAVA_SRC_DIR=${JAVA_SRC_DIR}"
 
 # ====== OS Variables
-export PATH="$PATH:/c/Program Files/OpenJDK/openjdk-11.0.8_10/bin:/C/Program Files/CMake/bin:/c/ProgramData/chocolatey/bin:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools:/c/Program Files/NASM"
+export PATH="$PATH:/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64:/c/Program Files/OpenJDK/openjdk-11.0.8_10/bin:/c/Program Files/CMake/bin:/c/ProgramData/chocolatey/bin:/c/Program Files/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools:/c/Program Files/NASM"
 export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.8_10"
 export VCPKG_DIR=$TRAVIS_BUILD_DIR/vcpkg
 
 # ====== Cleanup
-rm $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java || true
-rm $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java || true
+[ -f $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java ] && rm $JAVA_SRC_DIR/it/tdlight/tdnatives/TdApi.java
+[ -f $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java ] && rm $JAVA_SRC_DIR/it/tdlight/tdnatives/new_TdApi.java
 
 # ====== Environment setup
-mkdir -p $TRAVIS_BUILD_DIR/out || true
-mkdir $TD_BUILD_DIR || true
-mkdir $TDNATIVES_CPP_BUILD_DIR || true
+[ -d $TRAVIS_BUILD_DIR/out ] || mkdir -p $TRAVIS_BUILD_DIR/out
+[ -d $TD_BUILD_DIR ] || mkdir $TD_BUILD_DIR
+[ -d $TDNATIVES_CPP_BUILD_DIR ] || mkdir $TDNATIVES_CPP_BUILD_DIR
 choco install ccache
-choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
+choco install visualstudio2019buildtools --version=16.7.0.0 --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
 choco install openjdk11 --version=11.0.8.10
 choco install maven --version=3.6.3
 choco install base64