diff --git a/Moto/G6Plus/AndroidManifest.xml b/Moto/G6Plus/AndroidManifest.xml
index 15c43c3..8d6a3c9 100644
--- a/Moto/G6Plus/AndroidManifest.xml
+++ b/Moto/G6Plus/AndroidManifest.xml
@@ -2,6 +2,10 @@
         package="me.phh.treble.overlay.oneplus.op6"
         android:versionCode="1"
         android:versionName="1.0">
+	<!--
+		TESTS: Ignore ro.vendor.product.name
+		There is no vendor fingerprint: https://github.com/TadiT7/motorola_evert_dump/blob/evert_n-user-8.0.0-OPW27.113-45-53-release-keys/vendor/build.prop
+	-->
         <overlay android:targetPackage="android"
                 android:requiredSystemPropertyName="ro.vendor.product.name"
                 android:requiredSystemPropertyValue="evert_retail"
diff --git a/Sharp/S2/res/values/notch.xml b/Sharp/S2/res/values/notch.xml
index 95ca920..d24bb08 100644
--- a/Sharp/S2/res/values/notch.xml
+++ b/Sharp/S2/res/values/notch.xml
@@ -23,6 +23,5 @@
     <dimen name="status_bar_height">121px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
-    <dimen name="rounded_corner_content_padding">4.0dip</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -60,0 L -60,121 L 60,121 L 60,0 Z</string>
 </resources>
diff --git a/Xiaomi/Mi8SE/res/values/config.xml b/Xiaomi/Mi8SE/res/values/config.xml
index 4a2b1b6..cf8e88b 100644
--- a/Xiaomi/Mi8SE/res/values/config.xml
+++ b/Xiaomi/Mi8SE/res/values/config.xml
@@ -95,9 +95,7 @@
     <bool name="config_wifiDisplaySupportsProtectedBuffers">true</bool>
     <bool name="config_wifi_background_scan_support">true</bool>
     <bool name="config_wifi_batched_scan_supported">true</bool>
-    <bool name="config_wifi_disconnect_only_on_initial_ipreachability">true</bool>
     <bool name="config_wifi_dual_band_support">true</bool>
-    <bool name="config_wifi_dual_sap_mode_enabled">false</bool>
     <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
     <bool name="config_displayBlanksAfterDoze">true</bool>
     <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool>