diff --git a/Misc/Features/dm-verity.txt b/Misc/Features/dm-verity.txt
index 8c94965b..6d7a14aa 100644
--- a/Misc/Features/dm-verity.txt
+++ b/Misc/Features/dm-verity.txt
@@ -16,4 +16,3 @@ init.device.rc
 	on early-boot
 		# Update dm-verity state and set partition.*.verified properties
 		verity_update_state
-
diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh
index e2f32091..abe8e351 100644
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@@ -210,6 +210,7 @@ hardenDefconfig() {
 	done
 	#Extras
 	sed -i 's/CONFIG_ARCH_MMAP_RND_BITS=8/CONFIG_ARCH_MMAP_RND_BITS=16/' $defconfigPath &>/dev/null || true;
+	sed -i 's/CONFIG_ARCH_MMAP_RND_BITS=18/CONFIG_ARCH_MMAP_RND_BITS=24/' $defconfigPath &>/dev/null || true;
 	sed -i 's/CONFIG_DEFAULT_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' $defconfigPath &>/dev/null || true;
 	sed -i 's/CONFIG_LSM_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' $defconfigPath &>/dev/null || true;
 
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 7c95f8a5..243c3f65 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -71,7 +71,8 @@ export -f buildAll;
 
 patchWorkspace() {
 	if [ "$MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$prebuiltApps $base/build $base/device $base/vendor/cm"; fi;
-	#source build/envsetup.sh;
+	source build/envsetup.sh;
+	repopick -t n_asb_06-2018;
 
 	source $scripts/Patch.sh;
 	source $scripts/Defaults.sh;
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 58381c3d..17dabbab 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -214,7 +214,8 @@ sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod
 #
 #START OF DEVICE CHANGES
 #
-#enterAndClear "device/amazon/hdx-common";
+enterAndClear "device/amazon/hdx-common";
+sed -i 's/,encryptable=footer//' rootdir/etc/fstab.qcom; #Using footer will break the bootloader, it might work with /misc enabled
 #XXX: If not used with a supported recovery, it'll be thrown into a bootloop, don't worry just 'fastboot erase misc' and reboot
 #echo "/dev/block/platform/msm_sdcc.1/by-name/misc /misc emmc defaults defaults" >> rootdir/etc/fstab.qcom; #Add the misc (mmcblk0p5) partition for recovery flags