diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index e77d7c8..ee15571 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -1,7 +1,7 @@
-/dev/block/platform/msm_sdcc.1/by-name/system		/system		ext4		ro,errors=panic											wait
-/dev/block/platform/msm_sdcc.1/by-name/userdata		/data		ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic			wait,check,encryptable=footer
+/dev/block/platform/msm_sdcc.1/by-name/system		/system		ext4		ro,errors=panic											wait,recoveryonly
+/dev/block/platform/msm_sdcc.1/by-name/userdata		/data		ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=continue			wait,check,formattable,encryptable=footer,length=-16384
 # In stock, the following are mounted in init.target.rc. We do it in the fstab.
-/dev/block/platform/msm_sdcc.1/by-name/cache		/cache		ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic			wait,check
+/dev/block/platform/msm_sdcc.1/by-name/cache		/cache		ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=continue			wait,check,formattable
 /dev/block/platform/msm_sdcc.1/by-name/persist		/persist	ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic			wait,check
 /dev/block/platform/msm_sdcc.1/by-name/efs		/efs		ext4		nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic			wait,check
 /dev/block/platform/msm_sdcc.1/by-name/modem		/firmware-modem vfat		ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0	wait
@@ -10,6 +10,7 @@
 /dev/block/platform/msm_sdcc.1/by-name/boot		/boot		emmc		defaults											recoveryonly
 /dev/block/platform/msm_sdcc.1/by-name/recovery		/recovery       emmc		defaults											recoveryonly
 /dev/block/platform/msm_sdcc.1/by-name/hidden		/preload	ext4		defaults											recoveryonly
+/dev/block/platform/msm_sdcc.1/by-name/fota		/misc		emmc		defaults											defaults
 
 /devices/msm_sdcc.2/mmc_host/mmc*			auto		auto		defaults											voldmanaged=sdcard1:auto,encryptable=userdata
 /devices/platform/msm_hsusb_host/usb*			auto		auto		defaults											voldmanaged=usb:auto