diff --git a/gfx/drivers_shader/glslang_util.cpp b/gfx/drivers_shader/glslang_util.cpp
index 9dd86aade9..10aefead2a 100644
--- a/gfx/drivers_shader/glslang_util.cpp
+++ b/gfx/drivers_shader/glslang_util.cpp
@@ -40,10 +40,8 @@ using namespace std;
 static void get_include_file(
       const char *line, char *include_file, size_t len)
 {
-   char *start = NULL;
    char *end   = NULL;
-
-   start = (char*)strchr(line, '\"');
+   char *start = (char*)strchr(line, '\"');
 
    if (!start)
       return;
diff --git a/retroarch.c b/retroarch.c
index 877f133116..00e99719be 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -19527,12 +19527,13 @@ void driver_set_nonblock_state(void)
    /* Only apply non-block-state for video if we're using vsync. */
    if (video_driver_active && video_driver_get_ptr_internal(false))
    {
-      bool video_nonblock        = enable;
-
-      if (!settings->bools.video_vsync || runloop_force_nonblock)
-         video_nonblock = true;
       if (current_video->set_nonblock_state)
+      {
+         bool video_nonblock        = enable;
+         if (!settings->bools.video_vsync || runloop_force_nonblock)
+            video_nonblock = true;
          current_video->set_nonblock_state(video_driver_data, video_nonblock);
+      }
    }
 
    if (audio_driver_active && audio_driver_context_audio_data)