diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index ce5728ce..942280a1 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -53,7 +53,6 @@ buildAll() {
 	brunch lineage_clark-user;
 	brunch lineage_grouper-user; #deprecated
 	brunch lineage_thor-userdebug; #deprecated
-	brunch lineage_FP2-user;
 	brunch lineage_h815-user; #deprecated
 	brunch lineage_herolte-user; #deprecated
 	brunch lineage_himaul-user; #deprecated
@@ -76,6 +75,7 @@ buildAll() {
 	#brunch lineage_ether-user;
 	#brunch lineage_flo-user;
 	#brunch lineage_flounder-user;
+	#brunch lineage_FP2-user;
 	#brunch lineage_fugu-user;
 	#brunch lineage_griffin-user;
 	#brunch lineage_h850-user;
@@ -95,7 +95,8 @@ export -f buildAll;
 
 patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi;
-	source build/envsetup.sh;
+	#source build/envsetup.sh;
+	#repopick -t n_asb_08-2018;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 0a7a9591..d94a27e3 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -85,7 +85,7 @@ changeDefaultDNS;
 #patch -p1 < "$DOS_PATCHES/android_frameworks_base/0007-Connectivity.patch"; #Change connectivity check URLs to ours
 patch -p1 < "$DOS_PATCHES/android_frameworks_base/0008-Disable_Analytics.patch"; #Disable/reduce functionality of various ad/analytics libraries
 rm -rf packages/PrintRecommendationService; #App that just creates popups to install proprietary print apps
-rm core/res/res/values/config.xml.orig core/res/res/values/strings.xml.orig;
+rm -f core/res/res/*/*.orig;
 
 if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then
 enterAndClear "frameworks/opt/net/ims";
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 25e86eb8..73c170b1 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -61,7 +61,7 @@ buildAll() {
 	brunch lineage_ether-user;
 	brunch lineage_flo-user;
 	brunch lineage_flounder-user;
-	#brunch lineage_fp2-user; #still in bringup
+	brunch lineage_fp2-user;
 	brunch lineage_fugu-user;
 	brunch lineage_griffin-user;
 	brunch lineage_h850-user;
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 1acfd890..e39cca9f 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -86,7 +86,7 @@ changeDefaultDNS;
 #patch -p1 < "$DOS_PATCHES/android_frameworks_base/0005-Connectivity.patch"; #Change connectivity check URLs to ours
 patch -p1 < "$DOS_PATCHES/android_frameworks_base/0006-Disable_Analytics.patch"; #Disable/reduce functionality of various ad/analytics libraries
 rm -rf packages/PrintRecommendationService; #App that just creates popups to install proprietary print apps
-rm core/res/res/values/config.xml.orig core/res/res/values/strings.xml.orig;
+rm -f core/res/res/*/*.orig;
 
 if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then
 enterAndClear "frameworks/opt/net/ims";
@@ -122,14 +122,14 @@ sed -i 's/\"org\.fdroid\.fdroid/\"org.fdroid.fdroid_dos/' app/src/main/java/org/
 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
-rm AndroidManifest.xml.orig res/values/*.xml.orig;
+rm -f AndroidManifest.xml.orig res/*/*.orig;
 
 enterAndClear "packages/apps/Settings";
 git revert a96df110e84123fe1273bff54feca3b4ca484dcd; #don't hide oem unlock
 patch -p1 < "$DOS_PATCHES/android_packages_apps_Settings/0004-PDB_Fixes.patch"; #Fix crashes when the PersistentDataBlockManager service isn't available
 sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 48;/' src/com/android/settings/password/ChooseLockPassword.java; #Increase max password length
 if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/PrivacySettings.java; fi; #microG doesn't support Backup, hide the options
-rm res/values/strings.xml.orig;
+rm -f res/*/*.orig;
 
 enterAndClear "packages/apps/SetupWizard";
 patch -p1 < "$DOS_PATCHES/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch"; #Remove analytics
diff --git a/Scripts/init.sh b/Scripts/init.sh
index c3810826..37f48e3b 100644
--- a/Scripts/init.sh
+++ b/Scripts/init.sh
@@ -106,6 +106,7 @@ export ANDROID_JACK_VM_ARGS="-Xmx6144m -Xms512m -Dfile.encoding=UTF-8 -XX:+Tiere
 export JACK_SERVER_VM_ARGUMENTS="${ANDROID_JACK_VM_ARGS}";
 export GRADLE_OPTS="-Xmx2048m";
 export LC_ALL=C;
+#alias patch='patch --no-backup-if-mismatch';
 
 source "$DOS_SCRIPTS_COMMON/Functions.sh";
 source "$DOS_SCRIPTS/Functions.sh";