diff --git a/component-overrides.xml b/component-overrides.xml
index fc2529b..93ccf3e 100644
--- a/component-overrides.xml
+++ b/component-overrides.xml
@@ -18,4 +18,13 @@
     <component-override package="com.android.settings" >
         <component class="com.google.android.settings.dream.DreamSetupActivity" enabled="true" />
     </component-override>
+    <component-override package="com.android.dreams.basic" >
+        <component class="com.android.dreams.basic.Colors" enabled="false" />
+    </component-override>
+    <component-override package="com.google.android.deskclock">
+        <component class="com.android.deskclock.Screensaver" enabled="false" />
+    </component-override>
+    <component-override package="com.google.android.apps.photos">
+        <component class="com.google.android.apps.photos.daydream.PhotosDreamService" enabled="false" />
+    </component-override>
 </config>
diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc
index 31ffdb5..ad42c08 100644
--- a/conf/init.tangorpro.rc
+++ b/conf/init.tangorpro.rc
@@ -82,13 +82,13 @@ on post-fs-data
     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
+on property:ro.vendor.trusty.storage.fs_ready=1
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/1540.app
 # Permissions for hwcomposer
     chown system system /sys/class/backlight/panel0-backlight/cabc_mode
 
 # Castauth
-on post-fs-data
+on property:ro.vendor.trusty.storage.fs_ready=1
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/cast_auth.app
 
 # Wifi