diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk
index 72a3015..652d76e 100644
--- a/bluetooth/syna_default.mk
+++ b/bluetooth/syna_default.mk
@@ -17,7 +17,7 @@
 
 # Bluetooth Super Wide Band
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.hfp.swb.supported=true
+    bluetooth.hfp.swb.supported=false
 
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/powerhint.json b/powerhint.json
index b587199..1bc9f9f 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -134,6 +134,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -1053,6 +1063,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterMaxFreq",
diff --git a/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index 89a5c33..50db8ee 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -23,6 +23,9 @@
     <device name="dhdpcie_host_wake">
         <subsystem>Wifi</subsystem>
     </device>
+    <device name="MAILBOX_AOCF12APxE00">
+        <subsystem>Sound_trigger</subsystem>
+    </device>
     <device name="MAILBOX_AOCA322APx100">
         <subsystem>Sensor</subsystem>
     </device>