diff --git a/deps/miniupnpc/minissdpc.c b/deps/miniupnpc/minissdpc.c
index a6544787ec..2332780d10 100644
--- a/deps/miniupnpc/minissdpc.c
+++ b/deps/miniupnpc/minissdpc.c
@@ -145,7 +145,7 @@ getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath, int * err
 			if(n<=0) break; \
 			bufferindex = 0; \
 		} \
-		lcopy = MIN(l, (n - bufferindex)); \
+		lcopy = (unsigned int)MIN(l, (n - bufferindex)); \
 		memcpy(p, buffer + bufferindex, lcopy); \
 		l -= lcopy; \
 		p += lcopy; \
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index cdabb79ec4..ad12be1116 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -493,8 +493,8 @@ static void gl_glsl_strip_parameter_pragmas(char *source)
 static bool gl_glsl_load_source_path(struct video_shader_pass *pass,
       const char *path)
 {
-   int64_t len;
-   int nitems = pass ? filestream_read_file(path,
+   int64_t len    = 0;
+   int64_t nitems = pass ? filestream_read_file(path,
          (void**)&pass->source.string.vertex, &len) : 0;
 
    if (nitems <= 0 || len <= 0)
diff --git a/libretro-common/include/streams/interface_stream.h b/libretro-common/include/streams/interface_stream.h
index 3332aa725b..8ab80737f1 100644
--- a/libretro-common/include/streams/interface_stream.h
+++ b/libretro-common/include/streams/interface_stream.h
@@ -48,7 +48,7 @@ typedef struct intfstream_info
       struct
       {
          uint8_t *data;
-         unsigned size;
+         uint64_t size;
       } buf;
       bool writable;
    } memory;