diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index e7269d852d..82ee8cdf2c 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -382,8 +382,8 @@ 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
-    * settings->libretro is set here. */
-   if (!settings->libretro[0] && *argc >= 1 && strrchr(argv[0], '/'))
+    * settings->path.libretro is set here. */
+   if (!settings->path.libretro[0] && *argc >= 1 && strrchr(argv[0], '/'))
    {
       strlcpy(path, strrchr(argv[0], '/') + 1, sizeof(path));
       if (path_file_exists(path))
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index 51df9e37c5..ed31c21330 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -2179,7 +2179,7 @@ static bool frontend_linux_set_fork(enum frontend_fork fork_mode)
             settings_t *settings = config_get_ptr();
 
             fill_pathname_application_path(executable_path, sizeof(executable_path));
-            strlcpy(settings->libretro, executable_path, sizeof(settings->libretro));
+            strlcpy(settings->path.libretro, executable_path, sizeof(settings->path.libretro));
          }
          rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
          break;
diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c
index 9afd765091..481f0cb01c 100644
--- a/gfx/video_shader_driver.c
+++ b/gfx/video_shader_driver.c
@@ -284,7 +284,6 @@ bool video_shader_driver_ctl(enum video_shader_driver_ctl_state state, void *dat
             return current_shader->compile_program(program_info->data,
                   program_info->idx, NULL, program_info);
          }
-         break;
       case SHADER_CTL_USE:
          {
             video_shader_ctx_info_t *shader_info = (video_shader_ctx_info_t*)data;