diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index a4d5a2f36d..10cd30dd26 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -386,7 +386,7 @@ static void frontend_gx_exitspawn(char *s, size_t len)
             {
                fill_pathname_join(new_path, g_defaults.dir.core,
                      salamander_name, sizeof(new_path));
-               path_set_content(new_path);
+               path_set(RARCH_PATH_CONTENT, new_path);
             }
          }
          break;
@@ -415,7 +415,7 @@ static void frontend_gx_process_args(int *argc, char *argv[])
    /* A big hack: sometimes Salamander doesn't save the new core
     * it loads on first boot, so we make sure
     * active core path is set here. */
-   if (path_is_core_empty() && *argc >= 1 && strrchr(argv[0], '/'))
+   if (path_is_empty(RARCH_PATH_CORE) && *argc >= 1 && strrchr(argv[0], '/'))
    {
       char path[PATH_MAX_LENGTH] = {0};
       strlcpy(path, strrchr(argv[0], '/') + 1, sizeof(path));
diff --git a/retroarch.c b/retroarch.c
index 31a7ac84b2..467e5e3ddc 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -125,7 +125,7 @@ static enum rarch_core_type current_core_type           = CORE_TYPE_PLAIN;
 static enum rarch_core_type explicit_current_core_type  = CORE_TYPE_PLAIN;
 static char error_string[PATH_MAX_LENGTH]               = {0};
 
-static retro_bits_t has_set_libretro_device             = {0};
+static retro_bits_t has_set_libretro_device;
 static bool has_set_username                            = false;
 static bool rarch_is_inited                             = false;
 static bool rarch_error_on_init                         = false;
@@ -395,9 +395,7 @@ static void retroarch_parse_input(int argc, char *argv[])
    const char *optstring = NULL;
    bool explicit_menu    = false;
    settings_t *settings  = config_get_ptr();
-#ifdef HAVE_NETWORKING
    global_t  *global     = global_get_ptr();
-#endif
 
    const struct option opts[] = {
 #ifdef HAVE_DYNAMIC