diff --git a/apps/hosted/android/notification.c b/apps/hosted/android/notification.c
index 66715d26f9..39c8b07737 100644
--- a/apps/hosted/android/notification.c
+++ b/apps/hosted/android/notification.c
@@ -146,6 +146,6 @@ void notification_init(void)
     finishNotification = e->GetMethodID(env_ptr, class, "finishNotification",
                                         "()V");
 
-    add_event(PLAYBACK_EVENT_TRACK_CHANGE track_changed_callback);
-    add_event(PLAYBACK_EVENT_TRACK_FINISH track_finished_callback);
+    add_event(PLAYBACK_EVENT_TRACK_CHANGE, track_changed_callback);
+    add_event(PLAYBACK_EVENT_TRACK_FINISH, track_finished_callback);
 }
diff --git a/firmware/ata_idle_notify.c b/firmware/ata_idle_notify.c
index ee9f3c035f..a50866dcdc 100644
--- a/firmware/ata_idle_notify.c
+++ b/firmware/ata_idle_notify.c
@@ -25,6 +25,7 @@
 #include "kernel.h"
 #include "string.h"
 
+#if USING_STORAGE_CALLBACK
 static void wrapper(unsigned short id, void *ev_data, void *user_data)
 {
     (void)id;
@@ -32,6 +33,7 @@ static void wrapper(unsigned short id, void *ev_data, void *user_data)
     void (*func)(void) = user_data;
     func();
 }
+#endif
 
 void register_storage_idle_func(void (*function)(void))
 {