diff --git a/driver.c b/driver.c
index fe17c74029..84e7c2fef1 100644
--- a/driver.c
+++ b/driver.c
@@ -134,10 +134,9 @@ static int driver_find_index(const char * label, const char *drv)
 {
    unsigned i;
    char str[256];
-   const void           *obj = NULL;
 
-   for (i = 0; (obj = (const void*)
-            find_driver_nonempty(label, i, str, sizeof(str))) != NULL; i++)
+   for (i = 0; 
+         find_driver_nonempty(label, i, str, sizeof(str)) != NULL; i++)
    {
       if (string_is_empty(str))
          break;
diff --git a/libretro-common/formats/bmp/rbmp_encode.c b/libretro-common/formats/bmp/rbmp_encode.c
index 8b76958c5f..0bf59f1018 100644
--- a/libretro-common/formats/bmp/rbmp_encode.c
+++ b/libretro-common/formats/bmp/rbmp_encode.c
@@ -167,7 +167,6 @@ static void dump_content(RFILE *file, const void *frame,
                if(pad != 0)
                   filestream_write(file, &zeros, pad);
             }
-            return;
          }
          break;
       case RBMP_SOURCE_TYPE_ARGB8888:
diff --git a/libretro-common/formats/image_transfer.c b/libretro-common/formats/image_transfer.c
index fa09c65ca0..97d832c8ef 100644
--- a/libretro-common/formats/image_transfer.c
+++ b/libretro-common/formats/image_transfer.c
@@ -113,13 +113,15 @@ bool image_transfer_start(void *data, enum image_type_enum type)
       case IMAGE_TYPE_JPEG:
 #ifdef HAVE_RJPEG
          return true;
-#endif
+#else
          break;
+#endif
       case IMAGE_TYPE_TGA:
 #ifdef HAVE_RTGA
          return true;
-#endif
+#else
          break;
+#endif
       case IMAGE_TYPE_BMP:
          return true;
       case IMAGE_TYPE_NONE:
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 8c91663c8c..042dfbd3ef 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1650,8 +1650,9 @@ error:
 
 static bool command_event_cmd_exec(void *data)
 {
+   char *fullpath;
+#if defined(HAVE_DYNAMIC)
    content_ctx_info_t content_info;
-   char *fullpath = NULL;
 
    content_info.argc        = 0;
    content_info.argv        = NULL;
@@ -1660,8 +1661,10 @@ static bool command_event_cmd_exec(void *data)
    content_info.environ_get = menu_content_environment_get;
 #else
    content_info.environ_get = NULL;
+#endif
 #endif
 
+   fullpath = NULL;
    runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
 
    if (fullpath != data)