diff --git a/device-oriole.mk b/device-oriole.mk
index c450054..adde7b3 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -39,6 +39,8 @@ else
 include device/google/gs101/fingerprint/udfps_factory.mk
 endif
 
+SOONG_CONFIG_lyric_tuning_product := oriole
+SOONG_CONFIG_google3a_config_target_device := oriole
 
 # Init files
 PRODUCT_COPY_FILES += \
diff --git a/device-raven.mk b/device-raven.mk
index 2449322..38f5af0 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -45,6 +45,9 @@ endif
 
 include hardware/google/pixel/vibrator/cs40l25/device.mk
 
+SOONG_CONFIG_lyric_tuning_product := raven
+SOONG_CONFIG_google3a_config_target_device := raven
+
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.support_kernel_idle_timer=true
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.enable_frame_rate_override=true
 
diff --git a/device-slider.mk b/device-slider.mk
index add112d..acacaf7 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -28,6 +28,9 @@ include device/google/gs101/device-common.mk
 include device/google/raviole/audio/slider/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l25/device.mk
 
+SOONG_CONFIG_lyric_tuning_product := slider
+SOONG_CONFIG_google3a_config_target_device := slider
+
 # WirelessCharger
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
 
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 0820f67..52e556b 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -28,6 +28,9 @@ include device/google/gs101/device-common.mk
 include hardware/google/pixel/vibrator/drv2624/device.mk
 include device/google/raviole/audio/whitefin/audio-tables.mk
 
+SOONG_CONFIG_lyric_tuning_product := slider
+SOONG_CONFIG_google3a_config_target_device := slider
+
 # WirelessCharger
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
 
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index 4c91c33..c5041bf 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -111,7 +111,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 [HAL]antenna_pair_azimuth=4
-[HAL]antenna_pair_elevation=4
+[HAL]antenna_pair_elevation=0xff
 [HAL]tx_antenna=0
 [HAL]minimum_system_offset_uwbtime0=300
 restricted_channels=0