diff --git a/gfx/gl.c b/gfx/gl.c
index fe1e08d79f..890b41d3ef 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -292,7 +292,8 @@ static bool gl_shader_init(void *data)
 #ifdef HAVE_CG
       case RARCH_SHADER_CG:
          backend     = &gl_cg_backend;
-         shader_path = g_settings.video.cg_shader_path;
+         if (*g_settings.video.cg_shader_path)
+            shader_path = g_settings.video.cg_shader_path;
          break;
 #endif
 
diff --git a/gfx/shader_cg.c b/gfx/shader_cg.c
index 7fd6501b28..0a6e175885 100644
--- a/gfx/shader_cg.c
+++ b/gfx/shader_cg.c
@@ -907,7 +907,8 @@ void gl_cg_shader_scale(unsigned index, struct gfx_fbo_scale *scale)
 
 void gl_cg_set_menu_shader(const char *path)
 {
-   free(menu_cg_program);
+   if (menu_cg_program)
+      free(menu_cg_program);
    menu_cg_program = strdup(path);
 }
 
diff --git a/gfx/shader_parse.c b/gfx/shader_parse.c
index a1a7c94b02..8c7e70270d 100644
--- a/gfx/shader_parse.c
+++ b/gfx/shader_parse.c
@@ -237,8 +237,6 @@ static bool shader_parse_imports(config_file_t *conf, struct gfx_shader *shader)
          return false;
       }
 
-      enum state_ram_type ram_type = RARCH_STATE_NONE;
-
       if (strcmp(semantic, "capture") == 0)
          var->type = RARCH_STATE_CAPTURE;
       else if (strcmp(semantic, "transition") == 0)