diff --git a/Manifests/Manifest_LAOS-19.1.xml b/Manifests/Manifest_LAOS-19.1.xml
index 225b44c4..a18707b5 100644
--- a/Manifests/Manifest_LAOS-19.1.xml
+++ b/Manifests/Manifest_LAOS-19.1.xml
@@ -171,7 +171,7 @@
 	<!-- uses xiaomi sm8250 commons -->
 
 	<!-- Xiaomi POCO X3 Pro (vayu) -->
-	<project path="device/xiaomi/vayu" name="LineageOS/android_device_xiaomi_vayu" remote="github" />
+	<!--<project path="device/xiaomi/vayu" name="LineageOS/android_device_xiaomi_vayu" remote="github" />-->
 	<!-- uses xiaomi sm8150 commons -->
 
 </manifest>
diff --git a/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch b/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
index 07153294..00cc5589 100644
--- a/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
+++ b/Patches/LineageOS-19.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch
@@ -14,7 +14,7 @@ Change-Id: Ic01c97d6ceac8d324609763973639b41b4581a76
  6 files changed, 59 deletions(-)
 
 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 0c6542a..5dd522c 100644
+index b266fb7..5370ad8 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
 @@ -226,31 +226,6 @@
diff --git a/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch b/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch
index 6162627e..0990ef3b 100644
--- a/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch
+++ b/Patches/LineageOS-19.1/android_packages_apps_Updater/0002-Tor_Support.patch
@@ -72,10 +72,10 @@ index bfb2627..916e1e6 100644
      <string name="snack_update_not_installable">This update can\'t be installed on top of the current build.</string>
  
 diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
-index 395e801..7fddc87 100644
+index 9c56f0b..766fb83 100644
 --- a/src/org/lineageos/updater/UpdatesActivity.java
 +++ b/src/org/lineageos/updater/UpdatesActivity.java
-@@ -361,10 +361,14 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -377,10 +377,14 @@ public class UpdatesActivity extends UpdatesListActivity {
  
          final DownloadClient downloadClient;
          try {
@@ -90,7 +90,7 @@ index 395e801..7fddc87 100644
                      .build();
          } catch (IOException exception) {
              Log.e(TAG, "Could not build download client");
-@@ -444,6 +448,7 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -480,6 +484,7 @@ public class UpdatesActivity extends UpdatesListActivity {
      private void showPreferencesDialog() {
          View view = LayoutInflater.from(this).inflate(R.layout.preferences_dialog, null);
          Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval);
@@ -98,7 +98,7 @@ index 395e801..7fddc87 100644
          SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates);
          SwitchCompat dataWarning = view.findViewById(R.id.preferences_mobile_data_warning);
          SwitchCompat abPerfMode = view.findViewById(R.id.preferences_ab_perf_mode);
-@@ -455,6 +460,7 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -491,6 +496,7 @@ public class UpdatesActivity extends UpdatesListActivity {
  
          SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
          autoCheckInterval.setSelection(Utils.getUpdateCheckSetting(this));
@@ -106,7 +106,7 @@ index 395e801..7fddc87 100644
          autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false));
          dataWarning.setChecked(prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true));
          abPerfMode.setChecked(prefs.getBoolean(Constants.PREF_AB_PERF_MODE, false));
-@@ -494,6 +500,8 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -530,6 +536,8 @@ public class UpdatesActivity extends UpdatesListActivity {
                      prefs.edit()
                              .putInt(Constants.PREF_AUTO_UPDATES_CHECK_INTERVAL,
                                      autoCheckInterval.getSelectedItemPosition())
@@ -115,7 +115,7 @@ index 395e801..7fddc87 100644
                              .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked())
                              .putBoolean(Constants.PREF_MOBILE_DATA_WARNING, dataWarning.isChecked())
                              .putBoolean(Constants.PREF_AB_PERF_MODE, abPerfMode.isChecked())
-@@ -506,6 +514,10 @@ public class UpdatesActivity extends UpdatesListActivity {
+@@ -542,6 +550,10 @@ public class UpdatesActivity extends UpdatesListActivity {
                          UpdatesCheckReceiver.cancelUpdatesCheck(this);
                      }
  
diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh
index 271e878d..ad0f4d8b 100644
--- a/Scripts/LineageOS-19.1/Functions.sh
+++ b/Scripts/LineageOS-19.1/Functions.sh
@@ -82,7 +82,7 @@ buildAll() {
 	buildDevice hotdogb avb;
 	buildDevice coral avb;
 	buildDevice flame avb;
-	buildDevice vayu avb;
+	#buildDevice vayu avb; #unb
 	#SD865
 	buildDevice lmi avb;
 	#SD870
diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh
index 63365773..36eda1e8 100644
--- a/Scripts/LineageOS-19.1/Patch.sh
+++ b/Scripts/LineageOS-19.1/Patch.sh
@@ -435,7 +435,8 @@ enableAutoVarInit || true;
 #enableLowRam "device/sony/pioneer" "pioneer";
 
 #Fix broken options enabled by hardenDefconfig()
-#none yet
+sed -i "s/CONFIG_DEBUG_FS=y/# CONFIG_DEBUG_FS is not set/" kernel/google/redbull/arch/arm64/configs/redbull_defconfig; #Breaks vintf check
+sed -i "s/CONFIG_DEBUG_FS=y/# CONFIG_DEBUG_FS is not set/" kernel/xiaomi/sm8250/arch/arm64/configs/vendor/*_defconfig; #Breaks vintf check
 
 sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
 rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk || true;