diff --git a/gfx/video_display_server.c b/gfx/video_display_server.c
index 22a3b06cd0..2aa1af04c6 100644
--- a/gfx/video_display_server.c
+++ b/gfx/video_display_server.c
@@ -29,11 +29,11 @@ void* video_display_server_init(void)
 
    switch (type)
    {
-#if defined(_WIN32) && !defined(_XBOX)
       case RARCH_DISPLAY_WIN32:
+#if defined(_WIN32) && !defined(_XBOX)
          current_display_server = &dispserv_win32;
-         break;
 #endif
+         break;
       default:
          current_display_server = &dispserv_null;
          break;
diff --git a/libretro-common/streams/file_stream_transforms.c b/libretro-common/streams/file_stream_transforms.c
index 9f8406299d..ff11a32e34 100644
--- a/libretro-common/streams/file_stream_transforms.c
+++ b/libretro-common/streams/file_stream_transforms.c
@@ -38,7 +38,7 @@ RFILE* rfopen(const char *path, const char *mode)
    if (strstr(mode, "+"))
       retro_mode = RETRO_VFS_FILE_ACCESS_READ_WRITE;
 
-   return filestream_open(path, retro_mode, -1);
+   return filestream_open(path, retro_mode, RETRO_VFS_FILE_ACCESS_HINT_NONE);
 }
 
 int rfclose(RFILE* stream)
diff --git a/libretro-common/vfs/vfs_implementation.c b/libretro-common/vfs/vfs_implementation.c
index 949081c77b..dbd19cd8e8 100644
--- a/libretro-common/vfs/vfs_implementation.c
+++ b/libretro-common/vfs/vfs_implementation.c
@@ -157,7 +157,7 @@ int64_t retro_vfs_file_seek_internal(libretro_vfs_implementation_file *stream, i
    }
 #endif
 
-   if (lseek(stream->fd, offset, whence) < 0)
+   if (lseek(stream->fd, (off_t)offset, whence) < 0)
       goto error;
 
    return 0;
@@ -385,7 +385,7 @@ int64_t retro_vfs_file_read_impl(libretro_vfs_implementation_file *stream, void
       goto error;
 
    if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
-      return fread(s, 1, len, stream->fp);
+      return fread(s, 1, (size_t)len, stream->fp);
 
 #ifdef HAVE_MMAP
    if (stream->hints & RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS)
@@ -403,7 +403,7 @@ int64_t retro_vfs_file_read_impl(libretro_vfs_implementation_file *stream, void
    }
 #endif
 
-   return read(stream->fd, s, len);
+   return read(stream->fd, s, (size_t)len);
 
 error:
    return -1;
@@ -415,13 +415,13 @@ int64_t retro_vfs_file_write_impl(libretro_vfs_implementation_file *stream, cons
       goto error;
 
    if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
-      return fwrite(s, 1, len, stream->fp);
+      return fwrite(s, 1, (size_t)len, stream->fp);
 
 #ifdef HAVE_MMAP
    if (stream->hints & RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS)
       goto error;
 #endif
-   return write(stream->fd, s, len);
+   return write(stream->fd, s, (size_t)len);
 
 error:
    return -1;
@@ -534,7 +534,6 @@ int retro_vfs_file_rename_impl(const char *old_path, const char *new_path)
 #else
    return rename(old_path, new_path);
 #endif
-   return -1;
 }
 
 const char *retro_vfs_file_get_path_impl(libretro_vfs_implementation_file *stream)