diff --git a/Patches/LineageOS-16.0/android_packages_apps_Contacts/0001-No_Google_Links.patch b/Patches/Common/android_packages_apps_Contacts/0001-No_Google_Links.patch
similarity index 100%
rename from Patches/LineageOS-16.0/android_packages_apps_Contacts/0001-No_Google_Links.patch
rename to Patches/Common/android_packages_apps_Contacts/0001-No_Google_Links.patch
diff --git a/Patches/Linux b/Patches/Linux
index b630aceb..d8426c2a 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit b630aceb26b6bec59f60b5f92188af39b6e311a2
+Subproject commit d8426c2afedac9cb36c8337d0e1fa7aefd7bbf0f
diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh
index 120aea21..2aed5a5a 100644
--- a/Scripts/LineageOS-11.0/Functions.sh
+++ b/Scripts/LineageOS-11.0/Functions.sh
@@ -59,8 +59,7 @@ patchWorkspace() {
 	source build/envsetup.sh;
 	repopick -it asb-2018.09-cm11-qcom;
 	repopick -it asb-2019.02-cm11; #merged, execpt for level
-	#repopick -it asb-2019.03-cm11; #libnfc patches failing to apply
-	repopick -i 243758 244136 244129; #non nfc patches from asb-2019.03-cm11
+	#repopick -it asb-2019.03-cm11; #merged, but no level
 	repopick -i 230054 230392; #asb disclaimer
 
 	source "$DOS_SCRIPTS/Patch.sh";
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 07d0d250..079bd4ea 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -104,7 +104,7 @@ patchWorkspace() {
 	repopick 201113; #wifi country code fix
 	repopick 244387 244388; #loopback fixes
 	repopick -it n-tzdata2019a;
-	#repopick -it n-asb-2019-04;
+	repopick -it n-asb-2019-04;
 
 	export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails
 
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 1fa1f704..769c6f37 100644
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -120,6 +120,9 @@ enterAndClear "lineage-sdk";
 awk -i inplace '!/WeatherManagerServiceBroker/' lineage/res/res/values/config.xml; #Disable Weather
 if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAudioService/' lineage/res/res/values/config.xml; fi;
 
+enterAndClear "packages/apps/Contacts";
+patch -p1 < "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Links.patch"; #Remove Privacy Policy and Terms of Service links
+
 enterAndClear "packages/apps/LineageParts";
 rm -rf src/org/lineageos/lineageparts/lineagestats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml; #Nuke part of the analytics
 patch -p1 < "$DOS_PATCHES/android_packages_apps_LineageParts/0001-Remove_Analytics.patch"; #Remove analytics
@@ -193,7 +196,6 @@ sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.t
 enterAndClear "device/lge/g3-common";
 sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te;
 sed -i '1itypeattribute wcnss_service misc_block_device_exception;' sepolicy/wcnss_service.te;
-echo "/dev/block/platform/msm_sdcc\.1/by-name/pad     u:object_r:misc_block_device:s0" >> sepolicy/file_contexts; #fix uncrypt denial
 sed -i 's|qcrilmsgtunnel.apk|qcrilmsgtunnel.apk:vendor/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk|' proprietary-files.txt; #Fix vendor Android.mk path for qcrilmsgtunnel.apk
 
 enterAndClear "device/lge/msm8996-common";
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index 4451b954..1efe2e97 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -64,7 +64,6 @@ patchWorkspace() {
 
 	source build/envsetup.sh;
 	#repopick -it bt-sbc-hd-dualchannel-pie;
-	repopick 244148; #log spam fix
 	repopick 245252; #update webview
 	#repopick -it android-9.0.0_r35;
 
diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh
index f5750bc7..99b5bc96 100644
--- a/Scripts/LineageOS-16.0/Patch.sh
+++ b/Scripts/LineageOS-16.0/Patch.sh
@@ -126,7 +126,7 @@ awk -i inplace '!/LineageWeatherManagerService/' lineage/res/res/values/config.x
 if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAudioService/' lineage/res/res/values/config.xml; fi;
 
 enterAndClear "packages/apps/Contacts";
-patch -p1 < "$DOS_PATCHES/android_packages_apps_Contacts/0001-No_Google_Links.patch"; #Remove Privacy Policy and Terms of Service links
+patch -p1 < "$DOS_PATCHES_COMMON/android_packages_apps_Contacts/0001-No_Google_Links.patch"; #Remove Privacy Policy and Terms of Service links
 
 enterAndClear "packages/apps/LineageParts";
 rm -rf src/org/lineageos/lineageparts/lineagestats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml; #Nuke part of the analytics