diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index dfecf05..6a316c5 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -85,7 +85,7 @@ TARGET_RECOVERY_FSTAB_GENRULE := gen_fstab.zumapro-sw-encrypt
 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
 TARGET_RECOVERY_UI_LIB := \
-	librecovery_ui_pixel \
+	//hardware/google/pixel/recovery:librecovery_ui_pixel \
 	libfstab
 
 AB_OTA_UPDATER := true
diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc
index e99251c..5e7a520 100644
--- a/conf/init.zumapro.board.rc
+++ b/conf/init.zumapro.board.rc
@@ -639,6 +639,7 @@ on post-fs-data
     chown bluetooth system /proc/bluetooth/sleep/btwake
     chown bluetooth system /proc/bluetooth/sleep/lpm
     chown bluetooth system /proc/bluetooth/sleep/btwrite
+    chown bluetooth system /sys/devices/platform/155d0000.serial/uart_dbg
     mkdir /data/vendor/bluetooth 0770 bluetooth system
 
 # ODPM
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 93af15c..86b4982 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -492,6 +492,9 @@
     <!-- Telephony satellite gateway service package name to bind to by default. -->
     <string name="config_satellite_gateway_service_package">com.google.android.apps.stargate</string>
 
+    <!-- The class name to receive the intent for provisioning. -->
+    <string name="config_satellite_carrier_roaming_esos_provisioned_class">com.google.android.apps.stargate.registration.RegistrationReceiver_Receiver</string>
+
     <!-- List of country codes where oem-enabled satellite services are either allowed or disallowed
          by the device. Each country code is a lowercase 2 character ISO-3166-1 alpha-2. -->
     <string-array name="config_oem_enabled_satellite_country_codes">
@@ -545,4 +548,7 @@
     <!-- Whether to allow check message datagrams to be sent even when the satellite modem is in
          not connected state. -->
     <bool name="config_satellite_allow_check_message_in_not_connected">true</bool>
+
+    <!-- Whether to allow TN scanning during satellite session. -->
+    <bool name="config_satellite_allow_tn_scanning_during_satellite_session">false</bool>
 </resources>