diff --git a/bootstrap.d/14-fstab.sh b/bootstrap.d/14-fstab.sh
index c9c3ce3..bcd27c1 100644
--- a/bootstrap.d/14-fstab.sh
+++ b/bootstrap.d/14-fstab.sh
@@ -20,7 +20,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" >> "${ETC_DIR}/crypttab"
+  echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks,initramfs" >> "${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 5ba4c19..714772d 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -72,7 +72,7 @@ if [ "$KERNEL_ARCH" = "arm64" ] ; then
   KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
 fi
 
-if [RPI_MODEL] = 0 || [RPI_MODEL = 1] || [RPI_MODEL = 1P]
+if [ "$RPI_MODEL" = 0 || "$RPI_MODEL" = 1 || "$RPI_MODEL" = 1P ] ; then
 #RASPBERRY PI 1, PI ZERO, PI ZERO W, AND COMPUTE MODULE DEFAULT Kernel BUILD CONFIGURATION
   KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi_defconfig}
   KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
@@ -247,7 +247,7 @@ COMPILER_PACKAGES=""
 set +x
 
 # Set Raspberry Pi model specific configuration
-elif [ "$RPI_MODEL" = 0 ] ; then
+if [ "$RPI_MODEL" = 0 ] ; then
   DTB_FILE=${RPI2_DTB_FILE}
   UBOOT_CONFIG=${RPI2_UBOOT_CONFIG}
 elif [ "$RPI_MODEL" = 1 ] ; then