diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc
index fe863b8..0d4171c 100644
--- a/conf/init.tangorpro.rc
+++ b/conf/init.tangorpro.rc
@@ -73,6 +73,8 @@ on post-fs-data
     chown system system /sys/devices/platform/odm/odm:fp_fpc1020/hw_reset
     chown system system /sys/devices/platform/odm/odm:fp_fpc1020/irq
     chown system system /sys/devices/platform/odm/odm:fp_fpc1020/wakeup_enable
+
+on fs
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/1540.app
 
 # Castauth
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 59b84ba..aaad642 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -24,6 +24,7 @@ $(call inherit-product-if-exists, vendor/google_devices/tangorpro/prebuilts/devi
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/tangorpro/proprietary/tangorpro/device-vendor-tangorpro.mk)
+$(call inherit-product-if-exists, vendor/google_devices/tangorpro/proprietary/WallpapersTangorpro.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/tangorpro/tangorpro/overlay
 PRODUCT_SOONG_NAMESPACES += device/google/tangorpro
diff --git a/powerhint.json b/powerhint.json
index 5062a9a..cfe3ccc 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -525,11 +525,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "Value": "LAUNCH_120FPS"
-    },
     {
       "PowerHint": "LAUNCH",
       "Type": "DoHint",
@@ -1291,11 +1286,6 @@
       "Duration": 0,
       "Value": "63"
     },
-    {
-      "PowerHint": "REFRESH_60FPS",
-      "Type": "MaskHint",
-      "Value": "LAUNCH_120FPS"
-    },
     {
       "PowerHint": "ADPF_DISABLE_TA_BOOST",
       "Node": "TAUClampBoost",