diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index d12a273c..7e09eeed 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -112,7 +112,6 @@ sed -i 's/ln -s /ln -sf /' Android.mk;
 sed -i 's/ext.androidBuildVersionTools = "24.0.3"/ext.androidBuildVersionTools = "25.0.3"/' build.gradle;
 
 enterAndClear "packages/apps/FDroid"
-git checkout 6260c11efc0f8296c19ee8d075cafbc556869cd1
 patch -p1 < $patches"android_packages_apps_FDroid/0001.patch" #Mark as privileged
 cp $patches"android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos
 sed -i 's|gradle|./gradlew|' Android.mk; #Gradle 4.0 fix
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index e55e5b72..244a401f 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -67,7 +67,7 @@ buildAll() {
 	brunch lineage_flo-user;
 	brunch lineage_flounder-user;
 	#brunch lineage_hammerhead-user; #find: `hardware/cyanogen/cmhw': No such file or directory
-	#brunch lineage_marlin-user;
+	#brunch lineage_marlin-user; #include/linux/string.h:287:4: error: call to '__read_overflow2' declared with attribute error: detected read beyond size of object passed as 2nd parameter
 	#brunch lineage_sailfish-user;
 	brunch lineage_shamu-user;
 }
@@ -75,7 +75,7 @@ export -f buildAll;
 
 patchWorkspace() {
 	source build/envsetup.sh;
-	repopick 204743 204744 205021; #Cherry picks
+	repopick 204743 204744 205021 206123; #Cherry picks
 
 	source $scripts/Patch.sh;
 	source $scripts/Defaults.sh;
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 38809593..f0e8dab2 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -103,7 +103,6 @@ sed -i 's/ln -s /ln -sf /' Android.mk;
 sed -i 's/ext.androidBuildVersionTools = "24.0.3"/ext.androidBuildVersionTools = "25.0.3"/' build.gradle;
 
 enterAndClear "packages/apps/FDroid"
-git checkout 6260c11efc0f8296c19ee8d075cafbc556869cd1
 patch -p1 < $patches"android_packages_apps_FDroid/0001.patch" #Mark as privileged
 cp $patches"android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos
 sed -i 's|gradle|./gradlew|' Android.mk; #Gradle 4.0 fix
@@ -159,7 +158,7 @@ patch -p1 < $patches"android_packages_services_Telephony/0001-LTE_Only.patch" #L
 
 enterAndClear "system/core"
 cat /tmp/ar/hosts >> rootdir/etc/hosts #Merge in our HOSTS file
-git revert a6a4ce8e9a6d63014047a447c6bb3ac1fa90b3f4 #Always update recovery
+#git revert a6a4ce8e9a6d63014047a447c6bb3ac1fa90b3f4 #Always update recovery
 patch -p1 < $patches"android_system_core/0001-Harden_Mounts.patch" #Harden mounts with nodev/noexec/nosuid. Disclaimer: From CopperheadOS 13.0
 
 enterAndClear "system/vold"