diff --git a/audio/tangorpro/tuning/waves/waves_preset.mps b/audio/tangorpro/tuning/waves/waves_preset.mps
index 303abc8..43248ff 100644
Binary files a/audio/tangorpro/tuning/waves/waves_preset.mps and b/audio/tangorpro/tuning/waves/waves_preset.mps differ
diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc
index 7c1c9ac..ff68de6 100644
--- a/conf/init.tangorpro.rc
+++ b/conf/init.tangorpro.rc
@@ -85,7 +85,9 @@ on post-fs-data
 
 on property:ro.vendor.trusty.storage.fs_ready=1
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/1540.app
+
 # Permissions for hwcomposer
+on fs
     chown system system /sys/class/backlight/panel0-backlight/cabc_mode
 
 # Castauth
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index d069554..4075524 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -53,7 +53,6 @@ include device/google/tangorpro/audio/tangorpro/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
 include device/google/gs-common/touch/gti/gti.mk
 include device/google/gs-common/touch/nvt/nvt.mk
-include device/google/gs-common/wireless_charger/wireless_charger.mk
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,tangorpro)
diff --git a/tangorpro/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/tangorpro/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 81170f4..7325957 100644
--- a/tangorpro/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/tangorpro/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -17,9 +17,6 @@
 -->
 <resources>
     <!-- Location on the screen of the center of the fingerprint sensor. -->
-    <dimen name="physical_fingerprint_sensor_center_screen_location_x">2400px</dimen>
-    <dimen name="physical_fingerprint_sensor_center_screen_location_y">0px</dimen>
-
-    <item name="physical_charger_port_location_normalized_x" type="dimen" format="float">0</item>
-    <item name="physical_charger_port_location_normalized_y" type="dimen" format="float">.5</item>
+    <dimen name="physical_fingerprint_sensor_center_screen_location_x">0px</dimen>
+    <dimen name="physical_fingerprint_sensor_center_screen_location_y">160px</dimen>
 </resources>