diff --git a/common.mk b/common.mk
index 2697db6..5b5714f 100644
--- a/common.mk
+++ b/common.mk
@@ -248,7 +248,7 @@
 
 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power-service.samsung-libperfmgr
+    android.hardware.power-service.pixel-libperfmgr
 
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/power/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
diff --git a/configs/init/init.exynos9611.rc b/configs/init/init.exynos9611.rc
index 8a99617..6ae02e4 100644
--- a/configs/init/init.exynos9611.rc
+++ b/configs/init/init.exynos9611.rc
@@ -419,6 +419,8 @@
     write /dev/cpuset/system-background/cpus 0-7
     write /dev/cpuset/restricted/cpus 0-3
 
+    setprop vendor.powerhal.init 1
+
     # Cstate node
     chown radio system /sys/module/cpuidle/parameters/off
     chmod 0664 /sys/module/cpuidle/parameters/off
diff --git a/configs/init/init.samsung.rc b/configs/init/init.samsung.rc
index a8235d7..733a887 100644
--- a/configs/init/init.samsung.rc
+++ b/configs/init/init.samsung.rc
@@ -276,7 +276,7 @@
     chown system system /sys/devices/virtual/data_on
 
     # Permissions for Touchscreen
-    chown system radio /sys/class/sec/tsp/cmd
+    chown system system /sys/class/sec/tsp/cmd
     chown system system /sys/class/sec/tsp/input/enabled
     chmod 0660 /sys/class/sec/tsp/input/enabled
     chown root system /proc/tsp_msg
@@ -411,7 +411,7 @@
     chown system radio /sys/class/power_supply/battery/gps
     chown system radio /sys/class/power_supply/battery/wifi
     chown system radio /sys/class/power_supply/battery/lte
-    chown system radio /sys/class/power_supply/battery/lcd
+    chown system system /sys/class/power_supply/battery/lcd
     chown system radio /sys/class/power_supply/ps/status
     chmod 0664 /sys/class/power_supply/battery/wc_control
     chmod 0664 /sys/class/power_supply/battery/wc_control_cnt
diff --git a/vendor.prop b/vendor.prop
index e8b0438..3a1280a 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -55,6 +55,9 @@
 ro.crypto.metadata_init_delete_all_keys.enabled=true
 ro.crypto.volume.metadata.method=dm-default-key
 
+## Power HAL
+vendor.powerhal.disp.idle_support=false
+
 ## Samsung specific
 ro.product_ship=true
 # Set csc support in OMX