diff --git a/libretro-common/audio/audio_mixer.c b/libretro-common/audio/audio_mixer.c
index d064831696..74c494c1dc 100644
--- a/libretro-common/audio/audio_mixer.c
+++ b/libretro-common/audio/audio_mixer.c
@@ -991,7 +991,6 @@ static void audio_mixer_mix_mod(float* buffer, size_t num_frames,
 {
    int i;
    float samplef                    = 0.0f;
-   int samplei                      = 0;
    unsigned temp_samples            = 0;
    unsigned buf_free                = (unsigned)(num_frames * 2);
    int* pcm                         = NULL;
diff --git a/retroarch.c b/retroarch.c
index 274bae58db..76c7ea5863 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -30537,7 +30537,6 @@ static bool video_driver_find_driver(struct rarch_state *p_rarch)
       int rdr_minor                        = hwr->version_minor;
       const char *rdr_context_name         = hw_render_context_name(hwr->context_type, rdr_major, rdr_minor);
       enum retro_hw_context_type rdr_type  = hw_render_context_type(rdr_context_name);
-      video_driver_t *rdr_driver           = hw_render_context_driver(rdr_type, rdr_major, rdr_minor);
 
       p_rarch->current_video               = NULL;
 
@@ -30556,7 +30555,7 @@ static bool video_driver_find_driver(struct rarch_state *p_rarch)
                         rdr_context_name))
                   video_driver_save_as_cached(p_rarch, settings, rdr_context_name);
 
-               p_rarch->current_video = rdr_driver;
+               p_rarch->current_video = hw_render_context_driver(rdr_type, rdr_major, rdr_minor);
                return true;
 #else
                break;