diff --git a/CommandListener.cpp b/CommandListener.cpp
index 8780e98..b548a91 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -300,7 +300,7 @@
             cli->sendMsg(ResponseCode::CommandSyntaxError, "Usage: mountall", false);
             return 0;
         }
-        fs_mgr_mount_all(fstab);
+        fs_mgr_mount_all(fstab, MOUNT_MODE_DEFAULT);
         cli->sendMsg(ResponseCode::CommandOkay, "Mountall ran successfully", false);
         return 0;
     }
diff --git a/Disk.cpp b/Disk.cpp
index 2c2a2da..1e1a63e 100644
--- a/Disk.cpp
+++ b/Disk.cpp
@@ -21,6 +21,7 @@
 #include "VolumeBase.h"
 #include "VolumeManager.h"
 #include "ResponseCode.h"
+#include "Ext4Crypt.h"
 
 #include <android-base/file.h>
 #include <android-base/stringprintf.h>
@@ -438,6 +439,11 @@
 status_t Disk::partitionMixed(int8_t ratio) {
     int res;
 
+    if (e4crypt_is_native()) {
+        LOG(ERROR) << "Private volumes not yet supported on FBE devices";
+        return -EINVAL;
+    }
+
     destroyAllVolumes();
     mJustPartitioned = true;