diff --git a/cmd/qtsetup/check.go b/cmd/qtsetup/check.go
index cc4988b1..d79511e5 100755
--- a/cmd/qtsetup/check.go
+++ b/cmd/qtsetup/check.go
@@ -60,6 +60,7 @@ func check(buildTarget string) {
 
 			case "windows":
 				{
+					utils.Log.Infoln("MSYSTEM:", os.Getenv("MSYSTEM"))
 					utils.Log.Infoln("QT_MSYS2:", os.Getenv("QT_MSYS2"))
 					utils.Log.Infoln("QT_MSYS2_DIR:", os.Getenv("QT_MSYS2_DIR"))
 					utils.Log.Infoln("IsMsys2QtDir:", utils.IsMsys2QtDir())
diff --git a/cmd/qtsetup/prep.go b/cmd/qtsetup/prep.go
index 6b59e81a..bac7fea5 100755
--- a/cmd/qtsetup/prep.go
+++ b/cmd/qtsetup/prep.go
@@ -14,7 +14,7 @@ func prep() {
 	utils.Log.Info("running setup/prep")
 
 	if utils.UseMsys2() {
-		utils.RemoveAll(filepath.Join(utils.QT_MSYS2_DIR(), "usr", "bin", "go.exe"))
+		utils.RemoveAll(filepath.Join(utils.QT_MSYS2_DIR(), "..", "usr", "bin", "go.exe"))
 		utils.RunCmdOptional(exec.Command("cmd", "/C", "mklink", "/H", filepath.Join(utils.QT_MSYS2_DIR(), "..", "usr", "bin", "go.exe"), filepath.Join(runtime.GOROOT(), "bin", "go.exe")), fmt.Sprintf("create go symlink in your QT_MSYS2_DIR/usr/bin (%v)", filepath.Join(utils.QT_MSYS2_DIR(), "..", "usr", "bin")))
 	}
 
diff --git a/internal/docker/android/Dockerfile b/internal/docker/android/Dockerfile
index 02419958..9ad458e0 100755
--- a/internal/docker/android/Dockerfile
+++ b/internal/docker/android/Dockerfile
@@ -2,7 +2,7 @@ FROM therecipe/qt:base
 
 
 ENV JDK_DIR /usr/lib/jvm/java-8-openjdk-amd64
-RUN add-apt-repository -y ppa:openjdk-r/ppa && apt-get -qq update && apt-get -y -qq install openjdk-8-jdk && apt-get -qq clean
+RUN add-apt-repository -y ppa:openjdk-r/ppa && apt-get -qq update && apt-get -y -qq install openjdk-8-jdk && apt-get -qq clean && update-ca-certificates -f
 
 
 ENV SDK tools_r25.2.4-linux.zip