diff --git a/dynamic.c b/dynamic.c
index 108d94d6f7..34e2335f48 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -496,11 +496,7 @@ void init_libretro_sym(enum rarch_core_type type)
     * Every OS that this program supports should pass this. */
    rarch_assert(sizeof(void*) == sizeof(void (*)(void)));
 
-
    load_symbols(type);
-
-   //move this to init_core, will need to be tested
-   //pretro_set_environment(rarch_environment_cb);
 }
 
 /**
@@ -524,7 +520,7 @@ void uninit_libretro_sym(void)
 
    rarch_system_info_free();
 
-   driver->camera_active = false;
+   driver->camera_active   = false;
    driver->location_active = false;
 
    /* Performance counters no longer valid. */
diff --git a/retroarch.c b/retroarch.c
index 745e9d07b0..838cae9e47 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -343,8 +343,12 @@ void rarch_system_info_free(void)
    }
 
    /* No longer valid. */
-   free(g_system->special);
-   free(g_system->ports);
+   if (g_system->special)
+      free(g_system->special);
+   g_system->special = NULL;
+   if (g_system->ports)
+      free(g_system->ports);
+   g_system->ports   = NULL;
 
    free(g_system);
    g_system = NULL;