diff --git a/rootdir/etc/fstab.g3 b/rootdir/etc/fstab.g3
index 9899baa..c3ed17e 100644
--- a/rootdir/etc/fstab.g3
+++ b/rootdir/etc/fstab.g3
@@ -10,13 +10,13 @@
 /dev/block/platform/msm_sdcc.1/by-name/userdata     /data           ext4    noatime,nosuid,nodev,barrier=1,noatime,noauto_da_alloc,errors=continue      wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/encrypt
 /dev/block/platform/msm_sdcc.1/by-name/cache        /cache          ext4    noatime,nosuid,nodev,barrier=1,data=ordered                     wait,check
 /dev/block/platform/msm_sdcc.1/by-name/persist      /persist        ext4    nosuid,nodev,barrier=1,data=ordered,nodelalloc,nomblk_io_submit,errors=panic wait
-/dev/block/platform/msm_sdcc.1/by-name/boot         /boot           emmc    defaults                                                        defaults
-/dev/block/platform/msm_sdcc.1/by-name/recovery     /recovery       emmc    defaults                                                        defaults
+/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/modem        /firmware       vfat    ro,shortname=lower,uid=1000,gid=1026,dmask=227,fmask=337        wait
 
 /dev/block/platform/msm_sdcc.1/by-name/sns          /sns            ext4    nosuid,nodev,barrier=1,noatime,noauto_da_alloc,errors=continue wait
 /dev/block/platform/msm_sdcc.1/by-name/drm          /persist-lg     ext4    nosuid,nodev,barrier=1,noatime,noauto_da_alloc,errors=continue wait
 /dev/block/platform/msm_sdcc.1/by-name/mpt          /mpt            ext4    nosuid,nodev,barrier=1,noatime,noauto_da_alloc,errors=continue wait
 
-/devices/msm_sdcc.2/mmc_host                        auto            vfat    defaults voldmanaged=sdcard1:auto
-/devices/platform/xhci-hcd                          auto            vfat    defaults voldmanaged=usbdisk0:auto
+/devices/msm_sdcc.2/mmc_host*                       auto            auto    defaults voldmanaged=sdcard1:auto
+/devices/platform/xhci-hcd*                         auto            auto    defaults voldmanaged=usbdisk0:auto