diff --git a/frontend/frontend.c b/frontend/frontend.c
index 39a092d28b..8e97033344 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -81,7 +81,6 @@ void rarch_make_dir(const char *x, const char *name)
       }
    }
 }
-
 #endif
 
 static void rarch_get_environment(int argc, char *argv[])
@@ -139,10 +138,10 @@ static void rarch_get_environment(int argc, char *argv[])
 #endif
 }
 
-#if defined(__APPLE__)
+#if defined(IOS) || defined(OSX)
 void* rarch_main(void* args)
 #else
-int rarch_main(int argc, char *argv[])
+int main(int argc, char *argv[])
 #endif
 {
    frontend_ctx = (frontend_ctx_driver_t*)frontend_ctx_init_first();
@@ -277,17 +276,14 @@ int rarch_main(int argc, char *argv[])
    config_save_keybinds(g_extern.input_config_path);
 #endif
 
-   if (g_extern.main_is_init)
-      rarch_main_deinit();
-
 #ifdef RARCH_CONSOLE
    global_uninit_drivers();
 #endif
 #else
    while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate());
-   rarch_main_deinit();
 #endif
 
+   rarch_main_deinit();
    rarch_deinit_msg_queue();
 
 #ifdef PERF_TEST
@@ -316,10 +312,3 @@ int rarch_main(int argc, char *argv[])
 
    return 0;
 }
-
-#ifndef __APPLE__
-int main(int argc, char *argv[])
-{
-   return rarch_main(argc, argv);
-}
-#endif
diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index d7e28c6991..bddccc1b68 100644
--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -439,8 +439,10 @@ static void system_exec(const char *path, bool should_load_game)
 
    RARCH_LOG("Attempt to load executable: [%s].\n", path);
    char spawn_data[256];
+#ifndef IS_SALAMANDER
    char game_path[256];
    game_path[0] = '\0';
+#endif
 
    for(unsigned int i = 0; i < sizeof(spawn_data); ++i)
       spawn_data[i] = i & 0xff;