diff --git a/env/corellium/android/files/clangwrap.go b/env/corellium/android/files/clangwrap.go
index 7e00be8..7f17c48 100644
--- a/env/corellium/android/files/clangwrap.go
+++ b/env/corellium/android/files/clangwrap.go
@@ -14,7 +14,7 @@
 	cmd := exec.Command("clang")
 	if os.Getenv("GOARCH") == "arm" {
 		pref := os.Getenv("PREFIX")
-		cmd.Args = append(cmd.Args, "-target", "armv7a-linux-androideabi", "-Qunused-arguments", "-L"+pref+"/../home/arm-linux-androideabi/lib", "-B"+pref+"/../home/arm-linux-androideabi/lib")
+		cmd.Args = append(cmd.Args, "-target", "armv7a-linux-androideabi", "-Qunused-arguments", "-Wl,-rpath-link="+pref+"/../home/arm-linux-androideabi/lib", "-L"+pref+"/../home/arm-linux-androideabi/lib", "-B"+pref+"/../home/arm-linux-androideabi/lib")
 	}
 	cmd.Args = append(cmd.Args, args...)
 	cmd.Stdout = os.Stdout
diff --git a/env/corellium/android/install.sh b/env/corellium/android/install.sh
index aafb80f..8c227dd 100755
--- a/env/corellium/android/install.sh
+++ b/env/corellium/android/install.sh
@@ -10,18 +10,22 @@
 curl -o com.termux.boot.apk "https://f-droid.org/repo/com.termux.boot_7.apk"
 
 adb install com.termux.apk
+
+# Run Termux to set up filesystem.
+adb shell monkey -p com.termux -c android.intent.category.LAUNCHER 1
+
 adb install com.termux.boot.apk
 
 # Run boot app once to enable run-on-boot.
 adb shell monkey -p com.termux.boot -c android.intent.category.LAUNCHER 1
 
-# Run Termux to set up filesystem.
-adb shell monkey -p com.termux -c android.intent.category.LAUNCHER 1
+adb root
 
 # Wait for the Termux filesystem.
-sleep 5
+while adb shell ls /data/data/com.termux/files > /dev/null ; [ $? -ne 0 ]; do
+	sleep 1
+done
 
-adb root
 adb push buildkey /data/data/com.termux/files/home/.gobuildkey-host-android-arm64-corellium-android
 adb push files/exec.sh /data/data/com.termux
 adb push files/clangwrap.go /data/data/com.termux/files/home