diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 3e1ccafa..74d04552 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -310,9 +310,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/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 9be29e84..40113256 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -590,8 +590,14 @@ void Dumpstate::dumpDisplaySection(int fd) {
     DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo");
     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"},