diff --git a/device-comet.mk b/device-comet.mk
index ba84582..acb1e75 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -354,6 +354,10 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.front_720P_always_binning=true
 
+# Enable camera exif model/make reporting
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.exif_reveal_make_model=true
+
 # Media Performance Class 14
 PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34
 
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 89d6ae9..4269e01 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework">
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>11-12</version>
+        <version>12</version>
         <interface>
             <name>IDisplay</name>
             <instance>secondary</instance>
diff --git a/uwb/calibration.conf b/uwb/calibration.conf
index 15a5f2c..cbbd6f8 100644
--- a/uwb/calibration.conf
+++ b/uwb/calibration.conf
@@ -6,7 +6,7 @@ ant1.ch5.ant_delay=10:40:00:00
 ant1.ch9.ant_delay=10:40:00:00
 
 ant2.ch5.ant_delay=3D:40:00:00
-ant2.ch9.ant_delay=1F:40:00:00
+ant2.ch9.ant_delay=29:40:00:00
 
 ant3.ch5.ant_delay=10:40:00:00
 ant3.ch9.ant_delay=10:40:00:00
@@ -19,17 +19,17 @@ xtal_trim=0x30
 dual_rx_auto.accum_period=0x00
 
 # Increase TX power of 0.25 dB
-# ant0.ch5.pa_gain_offset=0x00
-# ant0.ch9.pa_gain_offset=0x00
+# ant0.ch5.pa_gain_offset=0x01
+# ant0.ch9.pa_gain_offset=0x01
 
 # Decrease TX power of -0.25 dB
-# ant1.ch5.pa_gain_offset=0x00
-# ant1.ch9.pa_gain_offset=0x00
+# ant1.ch5.pa_gain_offset=0xFF
+# ant1.ch9.pa_gain_offset=0xFF
 
 # Increase TX power of 0.25 dB
-# ant2.ch5.pa_gain_offset=0x00
-# ant2.ch9.pa_gain_offset=0x00
+# ant2.ch5.pa_gain_offset=0x01
+# ant2.ch9.pa_gain_offset=0x01
 
 # Decrease TX power of -0.25 dB
-# ant3.ch5.pa_gain_offset=0x00
-# ant3.ch9.pa_gain_offset=0x00
+# ant3.ch5.pa_gain_offset=0xFF
+# ant3.ch9.pa_gain_offset=0xFF
\ No newline at end of file