diff --git a/Patches/Linux b/Patches/Linux
index 5bc57254..9e586ab3 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit 5bc57254688fb38f62d12076909f1ff8cf58063d
+Subproject commit 9e586ab35a54488c97342996315895e590913357
diff --git a/PrebuiltApps b/PrebuiltApps
index abb629c3..b7e4620a 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit abb629c322f73ba54364fd25bfe3fc1423f8c085
+Subproject commit b7e4620a00d7b7cca5bc87f8d2e104977fe7c894
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index f2ced3a2..9a4fbedd 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -86,10 +86,7 @@ patchWorkspace() {
 
 	source build/envsetup.sh;
 	#repopick 219020 219022; #ab-neverallow-user
-
-	#broken by g3-oreo, pending merge
-	#repopick -f 214824 209584 209585 215010 214300; #g3-common
-	#repopick -f 211404 211405 211406 211407 211408 211409; #d852
+	#repopick -t g3-oreo g3-sdfat
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";