diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 5d27b6bc..2ea41e65 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -287,9 +287,7 @@ on init
     chown system system /sys/devices/platform/google,cpm/dc_ctl
     # Important to include dd_state as it's used in battery defender in charger mode
     chown system system /sys/devices/platform/google,charger/dd_state
-    # Disable dock-defend by default
     chown system system /sys/devices/platform/google,charger/dd_settings
-    write /sys/devices/platform/google,charger/dd_settings -1
 
     # Power Stats HAL
     chown system system /dev/bbd_pwrstat
diff --git a/device.mk b/device.mk
index 4ccfaec7..343a0453 100644
--- a/device.mk
+++ b/device.mk
@@ -857,6 +857,10 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
 PRODUCT_PRODUCT_PROPERTIES += \
 	persist.sys.fuse.passthrough.enable=true
 
+# Use FUSE BPF
+PRODUCT_PRODUCT_PROPERTIES += \
+	ro.fuse.bpf.enabled=true
+
 # Use /product/etc/fstab.postinstall to mount system_other
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.postinstall.fstab.prefix=/product
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 066cf0c3..ea613ccc 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -590,8 +590,14 @@ void Dumpstate::dumpDisplaySection(int fd) {
     DumpFileToFd(fd, "Secondary panel name", "/sys/devices/platform/exynos-drm/secondary-panel/panel_name");
     DumpFileToFd(fd, "Secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
     if (!PropertiesHelper::IsUserBuild()) {
-        DumpFileToFd(fd, "HWC Fence State", "/data/vendor/log/hwc/hwc_fence_state.txt");
-        DumpFileToFd(fd, "HWC Error Log", "/data/vendor/log/hwc/hwc_error_log.txt");
+        RunCommandToFd(fd, "HWC Fence States", {"/vendor/bin/sh", "-c",
+                           "for f in $(ls /data/vendor/log/hwc/*_hwc_fence_state*.txt); do "
+                           "echo $f ; cat $f ; done"},
+                           CommandOptions::WithTimeout(2).Build());
+        RunCommandToFd(fd, "HWC Error Logs", {"/vendor/bin/sh", "-c",
+                           "for f in $(ls /data/vendor/log/hwc/*_hwc_error_log*.txt); do "
+                           "echo $f ; cat $f ; done"},
+                           CommandOptions::WithTimeout(2).Build());
         RunCommandToFd(fd, "HWC Debug Dumps", {"/vendor/bin/sh", "-c",
                            "for f in $(ls /data/vendor/log/hwc/*_hwc_debug*.dump); do "
                            "echo $f ; cat $f ; done"},