diff --git a/bootstrap.d/14-fstab.sh b/bootstrap.d/14-fstab.sh
index 4ecba25..d3a0ca0 100644
--- a/bootstrap.d/14-fstab.sh
+++ b/bootstrap.d/14-fstab.sh
@@ -25,7 +25,7 @@ if [ "$ENABLE_CRYPTFS" = true ] ; then
 
   # Add encrypted partition to crypttab and fstab
   install_readonly files/mount/crypttab "${ETC_DIR}/crypttab"
-  echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks,initramfs" >> "${ETC_DIR}/crypttab"
+  echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks" >> "${ETC_DIR}/crypttab"
 
   if [ "$ENABLE_SPLITFS" = true ] ; then
     # Add usb/sda disk to crypttab
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index b9be4c8..c9431b5 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -428,10 +428,10 @@ fi
 if [ "$ENABLE_UBOOT" = true ] ; then
   APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex,bc"
 else
-  if [ "$ENABLE_UBOOTUSB" = true ] ; then  
-    echo "error: Enabling UBOOTUSB requires u-boot to be enabled"
-	exit 1
-  fi
+#  if [ "$ENABLE_UBOOTUSB" = true ] ; then  
+#    echo "error: Enabling UBOOTUSB requires u-boot to be enabled"
+#	exit 1
+#  fi
 fi
 
 # Check if root SSH (v2) public key file exists