diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index a5eee5e..110c837 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -116,6 +116,7 @@ include device/google/tangorpro/bluetooth/syna_default.mk
 # Fingerprint
 include device/google/gs101/fingerprint/fpc1540/sw42/fpc1540.mk
 FPC_MODULE_TYPE=1542_S
+$(call soong_config_set,fp_hal_feature,pixel_product, product_b)
 # Fingerprint config
 include device/google/tangorpro/fingerprint_config.mk
 
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index c7075bf..2cf44c8 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # UWB - ultra wide band
-$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk)
+$(call inherit-product-if-exists, vendor/qorvo/uwb/dw3000-hal/uwb.mk)
 
 LOCAL_UWB_CAL_DIR=device/google/tangorpro/uwb