diff --git a/content.c b/content.c
index ad8721076f..80166a5fc3 100644
--- a/content.c
+++ b/content.c
@@ -329,11 +329,15 @@ error:
  *
  * Load a RAM state from disk to memory.
  */
-static bool load_ram_file(ram_type_t *ram)
+static bool load_ram_file(void *data)
 {
    ssize_t rc;
    retro_ctx_memory_info_t mem_info;
-   void *buf   = NULL;
+   void *buf       = NULL;
+   ram_type_t *ram = (ram_type_t*)data;
+
+   if (!ram)
+      return false;
 
    mem_info.id  = ram->type;
 
@@ -812,13 +816,7 @@ bool content_ctl(enum content_ctl_state state, void *data)
    switch(state)
    {
       case CONTENT_CTL_LOAD_RAM_FILE:
-         {
-            ram_type_t *ram = (ram_type_t*)data;
-            if (!ram)
-               return false;
-            return load_ram_file(ram);
-         }
-         break;
+         return load_ram_file(data);
       case CONTENT_CTL_SAVE_RAM_FILE:
          {
             ram_type_t *ram = (ram_type_t*)data;
diff --git a/libretro_version_1.c b/libretro_version_1.c
index ee8f8dd7f9..aebf11784a 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -233,7 +233,6 @@ bool core_ctl(enum core_ctl_state state, void *data)
                return core.retro_load_game_special(load_info->special->id, load_info->info, load_info->content->size);
             return core.retro_load_game(*load_info->content->elems[0].data ? load_info->info : NULL);
          }
-         break;
       case CORE_CTL_RETRO_GET_SYSTEM_INFO:
          {
             struct retro_system_info *system = (struct retro_system_info*)data;