diff --git a/build/linux.sh b/build/linux.sh
index f4c4196..63a39a2 100755
--- a/build/linux.sh
+++ b/build/linux.sh
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 
-DIR_BUILD=$TRAVIS_BUILD_DIR-build
-mkdir $DIR_BUILD
+mkdir $TRAVIS_BUILD_DIR-build
 
-cd $DIR_BUILD
+cd $TRAVIS_BUILD_DIR-build
 qmake CONFIG+=release PREFIX=/usr $TRAVIS_BUILD_DIR
 make
 make install INSTALL_ROOT=AppDir
diff --git a/build/osx.sh b/build/osx.sh
index 66a7a7a..0cfcded 100755
--- a/build/osx.sh
+++ b/build/osx.sh
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 
-DIR_BUILD=$TRAVIS_BUILD_DIR-build
-mkdir $DIR_BUILD
+mkdir $TRAVIS_BUILD_DIR-build
 
-cd $DIR_BUILD
+cd $TRAVIS_BUILD_DIR-build
 qmake CONFIG+=release $TRAVIS_BUILD_DIR
 make
 
diff --git a/build/windows.bat b/build/windows.bat
index 8ddbd5a..a70781b 100755
--- a/build/windows.bat
+++ b/build/windows.bat
@@ -6,7 +6,6 @@ mkdir "%APPVEYOR_BUILD_FOLDER%-build"
 qmake CONFIG+=release -o "%APPVEYOR_BUILD_FOLDER%-build" "%APPVEYOR_BUILD_FOLDER%"
 cd /d "%APPVEYOR_BUILD_FOLDER%-build"
 nmake
-cd /d "%APPVEYOR_BUILD_FOLDER%"
 
 set "DEPLOYMENT_DIR=%TEMP%\ApkStudio-%RANDOM%.tmp"
 mkdir %DEPLOYMENT_DIR%
@@ -15,5 +14,5 @@ windeployqt "%DEPLOYMENT_DIR%\ApkStudio.exe" --release
 mkdir %APPVEYOR_BUILD_FOLDER%\deploy
 
 set SETUP_FILE_PREFIX=ApkStudio-
-if not %APPVEYOR_REPO_TAG_NAME% == "" set SETUP_FILE_PREFIX=%SETUP_FILE_NAME%-%APPVEYOR_REPO_TAG_NAME%
+if not %APPVEYOR_REPO_TAG_NAME% == "" set SETUP_FILE_PREFIX=%SETUP_FILE_PREFIX%-%APPVEYOR_REPO_TAG_NAME%
 iscc /O"%APPVEYOR_BUILD_FOLDER%\deploy" /F"%SETUP_FILE_PREFIX%-%VCARCH%" "%APPVEYOR_BUILD_FOLDER%\resources\apkstudio.iss"