diff --git a/battery_mitigation/battery_mitigation.rc b/battery_mitigation/battery_mitigation.rc
index 4cdbbf6e..37f8fd66 100644
--- a/battery_mitigation/battery_mitigation.rc
+++ b/battery_mitigation/battery_mitigation.rc
@@ -1,14 +1,18 @@
 on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,ocp
     copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt
+    chown system system data/vendor/mitigation/lastmeal.txt
 
 on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,uvlo,pmic,if
     copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt
+    chown system system data/vendor/mitigation/lastmeal.txt
 
 on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,uvlo,pmic,main
     copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt
+    chown system system data/vendor/mitigation/lastmeal.txt
 
 on property:sys.boot_completed=1 && property:ro.boot.bootreason=reboot,uvlo,pmic,sub
     copy data/vendor/mitigation/thismeal.txt data/vendor/mitigation/lastmeal.txt
+    chown system system data/vendor/mitigation/lastmeal.txt
 
 on property:vendor.thermal.link_ready=1
     mkdir /data/vendor/mitigation 0755 system system
diff --git a/conf/init.debug.rc b/conf/init.debug.rc
index 282acd40..b7512e4e 100644
--- a/conf/init.debug.rc
+++ b/conf/init.debug.rc
@@ -30,4 +30,5 @@ on property:power.battery_input.suspended=false
 # Bluetooth
 on post-fs-data
     chown bluetooth system /dev/logbuffer_btlpm
+    chown bluetooth system /dev/logbuffer_btpower
     chown bluetooth system /dev/logbuffer_tty18
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index cf8fc158..287a36e8 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -295,9 +295,6 @@ on init
     # Power Stats HAL
     chown system system /dev/bbd_pwrstat
 
-    # start watchdogd
-    start watchdogd
-
     # Add a boost for NNAPI HAL
     write /proc/vendor_sched/nnapi_prefer_idle 0
     write /proc/vendor_sched/nnapi_uclamp_min 512
@@ -840,12 +837,6 @@ service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.gs20
     disabled
     oneshot
 
-# Set watchdog timer to 30 seconds and pet it every 10 seconds to get a 20 second margin
-service watchdogd /system/bin/watchdogd 10 20
-    class core
-    oneshot
-    seclabel u:r:watchdogd:s0
-
 # bugreport is triggered by holding down volume down, volume up and power
 service bugreport /system/bin/dumpstate -d -p -z
     class main