diff --git a/internal/binding/templater/template_cgo.go b/internal/binding/templater/template_cgo.go
index bd19993a..c1089dcf 100644
--- a/internal/binding/templater/template_cgo.go
+++ b/internal/binding/templater/template_cgo.go
@@ -75,7 +75,7 @@ func cgoIos(module, mocPath string, mode int, pkg string) string {
 
 	case "TestLib":
 		{
-			fmt.Fprintf(bb, " -F%v/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks -weak_framework XCTest", utils.XCODE_DIR())
+			//fmt.Fprintf(bb, " -F%v/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks -weak_framework XCTest", utils.XCODE_DIR())
 		}
 
 	case "Qml", "WebChannel", "Quick", "QuickControls2":
@@ -103,7 +103,7 @@ func cgoIos(module, mocPath string, mode int, pkg string) string {
 
 	if module == "build_ios" {
 		fmt.Fprint(bb, " -lQt5OpenGL")
-		fmt.Fprintf(bb, " -F%v/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks -weak_framework XCTest", utils.XCODE_DIR())
+		//fmt.Fprintf(bb, " -F%v/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks -weak_framework XCTest", utils.XCODE_DIR())
 		fmt.Fprint(bb, " -lQt5Quick -lQt5QuickParticles -lQt5QuickTest -lQt5QuickWidgets")
 		fmt.Fprintf(bb, " -L%v/%v/ios/plugins/qmltooling -lqmldbg_debugger -lqmldbg_inspector -lqmldbg_local -lqmldbg_native -lqmldbg_profiler -lqmldbg_quickprofiler -lqmldbg_server -lQt5PacketProtocol -lqmldbg_tcp", utils.QT_DIR(), utils.QT_VERSION_MAJOR())
 
diff --git a/internal/cmd/deploy/assets.go b/internal/cmd/deploy/assets.go
index b77e71c1..237805cc 100644
--- a/internal/cmd/deploy/assets.go
+++ b/internal/cmd/deploy/assets.go
@@ -696,7 +696,7 @@ func sailfish_ssh(port, login string, cmd ...string) error {
 		return err
 	}
 
-	client, err := ssh.Dial("tcp", "localhost:"+port, &ssh.ClientConfig{User: login, Auth: []ssh.AuthMethod{ssh.PublicKeys(signer)}})
+	client, err := ssh.Dial("tcp", "localhost:"+port, &ssh.ClientConfig{User: login, Auth: []ssh.AuthMethod{ssh.PublicKeys(signer)}, HostKeyCallback: ssh.InsecureIgnoreHostKey()})
 	if err != nil {
 		return err
 	}
diff --git a/internal/cmd/deploy/run.go b/internal/cmd/deploy/run.go
index a331726e..2250f8eb 100644
--- a/internal/cmd/deploy/run.go
+++ b/internal/cmd/deploy/run.go
@@ -14,15 +14,18 @@ import (
 func run(target, name, depPath string) {
 	switch target {
 	case "android", "android-emulator":
-		exec.Command(filepath.Join(utils.ANDROID_SDK_DIR(), "platform-tools", "adb"), "install", "-r", filepath.Join(depPath, "build-debug.apk")).Start()
-		exec.Command(filepath.Join(utils.ANDROID_SDK_DIR(), "platform-tools", "adb"), "install", "-r", filepath.Join(depPath, "build-release-signed.apk")).Start()
+		if utils.ExistsFile(filepath.Join(depPath, "build-debug.apk")) {
+			utils.RunCmdOptional(exec.Command(filepath.Join(utils.ANDROID_SDK_DIR(), "platform-tools", "adb"), "install", "-r", filepath.Join(depPath, "build-debug.apk")), "install debug app")
+		} else {
+			utils.RunCmdOptional(exec.Command(filepath.Join(utils.ANDROID_SDK_DIR(), "platform-tools", "adb"), "install", "-r", filepath.Join(depPath, "build-release-signed.apk")), "install release app")
+		}
 
 	case "ios-simulator":
 		//TODO: parse list of available simulators
-		exec.Command("xcrun", "instruments", "-w", "iPhone 7 Plus (10.2)#").Run()
-		exec.Command("xcrun", "simctl", "uninstall", "booted", filepath.Join(depPath, "main.app")).Run()
-		exec.Command("xcrun", "simctl", "install", "booted", filepath.Join(depPath, "main.app")).Run()
-		exec.Command("xcrun", "simctl", "launch", "booted", fmt.Sprintf("com.identifier.%v", name)).Run()
+		utils.RunCmdOptional(exec.Command("xcrun", "instruments", "-w", "iPhone 7 Plus (10.3)#"), "start simulator")
+		utils.RunCmdOptional(exec.Command("xcrun", "simctl", "uninstall", "booted", filepath.Join(depPath, "main.app")), "uninstall old app")
+		utils.RunCmdOptional(exec.Command("xcrun", "simctl", "install", "booted", filepath.Join(depPath, "main.app")), "install new app")
+		utils.RunCmdOptional(exec.Command("xcrun", "simctl", "launch", "booted", fmt.Sprintf("com.identifier.%v", name)), "start app")
 
 	case "darwin":
 		exec.Command("open", filepath.Join(depPath, fmt.Sprintf("%v.app", name))).Start()
@@ -38,13 +41,13 @@ func run(target, name, depPath string) {
 		}
 
 	case "sailfish-emulator":
-		exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "registervm", filepath.Join(utils.SAILFISH_DIR(), "emulator", "SailfishOS Emulator", "SailfishOS Emulator.vbox")).Run()
-		exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "sharedfolder", "add", "SailfishOS Emulator", "--name", "GOPATH", "--hostpath", utils.MustGoPath(), "--automount").Run()
+		utils.RunCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "registervm", filepath.Join(utils.SAILFISH_DIR(), "emulator", "SailfishOS Emulator", "SailfishOS Emulator.vbox")), "register vm")
+		utils.RunCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "sharedfolder", "add", "SailfishOS Emulator", "--name", "GOPATH", "--hostpath", utils.MustGoPath(), "--automount"), "mount GOPATH")
 
 		if runtime.GOOS == "windows" {
-			exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "startvm", "SailfishOS Emulator").Run()
+			utils.RunCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "startvm", "SailfishOS Emulator"), "start emulator")
 		} else {
-			exec.Command("nohup", filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "startvm", "SailfishOS Emulator").Run()
+			utils.RunCmdOptional(exec.Command("nohup", filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "startvm", "SailfishOS Emulator"), "start emulator")
 		}
 
 		time.Sleep(10 * time.Second)