diff --git a/native/src/init/mount.cpp b/native/src/init/mount.cpp
index 9dd4d7d5a..73468318e 100644
--- a/native/src/init/mount.cpp
+++ b/native/src/init/mount.cpp
@@ -121,7 +121,7 @@ static void switch_root(const string &path) {
 
 #define PREINITMNT MIRRDIR "/preinit"
 
-static void mount_preinit_dir(string path, string preinit_dev) {
+static void mount_preinit_dir(string preinit_dev) {
     if (preinit_dev.empty()) return;
     strcpy(blk_info.partname, preinit_dev.data());
     strcpy(blk_info.block_dev, PREINITDEV);
@@ -156,7 +156,6 @@ static void mount_preinit_dir(string path, string preinit_dev) {
         } else {
             LOGD("preinit: %s\n", preinit_dir.data());
             xmount(preinit_dir.data(), PREINITMIRR, nullptr, MS_BIND, nullptr);
-            mount_list.emplace_back(path += "/" PREINITMIRR);
         }
         xumount2(PREINITMNT, MNT_DETACH);
     } else {
@@ -265,7 +264,7 @@ void MagiskInit::setup_tmp(const char *path) {
     xmkdir(BLOCKDIR, 0);
     xmkdir(WORKERDIR, 0);
 
-    mount_preinit_dir(path, preinit_dev);
+    mount_preinit_dir(preinit_dev);
 
     cp_afc(".backup/.magisk", INTLROOT "/config");
     rm_rf(".backup");
@@ -275,7 +274,7 @@ void MagiskInit::setup_tmp(const char *path) {
         xsymlink("./magisk", applet_names[i]);
     xsymlink("./magiskpolicy", "supolicy");
 
-    xmount(".", path, nullptr, MS_BIND | MS_REC, nullptr);
+    xmount(".", path, nullptr, MS_BIND, nullptr);
 
     chdir("/");
 }
diff --git a/native/src/init/rootdir.cpp b/native/src/init/rootdir.cpp
index ba1637c5b..ed651477f 100644
--- a/native/src/init/rootdir.cpp
+++ b/native/src/init/rootdir.cpp
@@ -231,11 +231,10 @@ void MagiskInit::patch_ro_root() {
     }
 
     setup_tmp(tmp_dir.data());
-    chdir(tmp_dir.data());
+    chdir("/data");
 
-    // Recreate original sbin structure if necessary
     if (tmp_dir == "/sbin") {
-        // Mount system_root mirror
+        // Recreate original sbin structure
         xmkdir(ROOTMIR, 0755);
         xmount("/", ROOTMIR, nullptr, MS_BIND, nullptr);
         recreate_sbin(ROOTMIR "/sbin", true);
@@ -280,7 +279,8 @@ void MagiskInit::patch_ro_root() {
     // Oculus Go will use a special sepolicy if unlocked
     if (access("/sepolicy.unlocked", F_OK) == 0) {
         patch_sepolicy("/sepolicy.unlocked", ROOTOVL "/sepolicy.unlocked");
-    } else if ((access(SPLIT_PLAT_CIL, F_OK) != 0 && access("/sepolicy", F_OK) == 0) || !hijack_sepolicy()) {
+    } else if ((access(SPLIT_PLAT_CIL, F_OK) != 0 && access("/sepolicy", F_OK) == 0) ||
+               !hijack_sepolicy()) {
         patch_sepolicy("/sepolicy", ROOTOVL "/sepolicy");
     }