diff --git a/Makefile.griffin b/Makefile.griffin
index 989b171faa..bab89afae4 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -834,7 +834,7 @@ else ifneq (,$(findstring unix,$(platform)))
 endif
 
 ifneq (,$(findstring msvc,$(platform)))
-   CFLAGS += -W2 $(MACHDEP) $(PLATCFLAGS)
+   CFLAGS += -W3 $(MACHDEP) $(PLATCFLAGS)
 else
    CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
    INCLUDE += -I./libretro-common/include \
diff --git a/libretro-common/vfs/vfs_implementation_cdrom.c b/libretro-common/vfs/vfs_implementation_cdrom.c
index 39292eaf80..537dc7acac 100644
--- a/libretro-common/vfs/vfs_implementation_cdrom.c
+++ b/libretro-common/vfs/vfs_implementation_cdrom.c
@@ -340,7 +340,7 @@ int64_t retro_vfs_file_read_cdrom(libretro_vfs_implementation_file *stream,
 
    if (string_is_equal_noncase(ext, "cue"))
    {
-      if (len < (unsigned)(stream->cdrom.cue_len - stream->cdrom.byte_pos))
+      if ((int64_t)len < (int64_t)stream->cdrom.cue_len - stream->cdrom.byte_pos)
       {
 #ifdef CDROM_DEBUG
          printf("[CDROM] Read: Reading %" PRIu64 " bytes from cuesheet starting at %" PRIu64 "...\n", len, stream->cdrom.byte_pos);