diff --git a/Makefile b/Makefile
index b820c54233..6522fe76bf 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ ifneq ($(V),1)
    Q := @
 endif
 
-ifeq ($(DEBUG), 1)
+ifneq ($(DEBUG), 0)
    OPTIMIZE_FLAG = -O0 -g
 else
    OPTIMIZE_FLAG = -O3 -ffast-math
diff --git a/libretro-common/streams/file_stream_transforms.c b/libretro-common/streams/file_stream_transforms.c
index b784cfccae..898893f96e 100644
--- a/libretro-common/streams/file_stream_transforms.c
+++ b/libretro-common/streams/file_stream_transforms.c
@@ -30,8 +30,7 @@ RFILE* rfopen(const char *path, const char *mode)
 {
    unsigned int retro_mode = 0;
    if (strstr(mode, "r"))
-      if (strstr(mode, "b"))
-         retro_mode = RETRO_VFS_FILE_ACCESS_READ;
+      retro_mode = RETRO_VFS_FILE_ACCESS_READ;
 
    if (strstr(mode, "w"))
       retro_mode = RETRO_VFS_FILE_ACCESS_WRITE;
diff --git a/libretro-common/vfs/vfs_implementation.c b/libretro-common/vfs/vfs_implementation.c
index a75441a3d0..61088dd606 100644
--- a/libretro-common/vfs/vfs_implementation.c
+++ b/libretro-common/vfs/vfs_implementation.c
@@ -235,13 +235,17 @@ libretro_vfs_implementation_file *retro_vfs_file_open_impl(const char *path, uns
 #endif
          }
          break;
-         /* TODO/FIXME - implement */
       case RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING:
-         break;
+         /* TODO/FIXME - implement */
+         return NULL;
+      default:
+         return NULL;
    }
 
-   if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0 && mode_str)
+   if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0)
    {
+      if (!mode_str)
+         return NULL;
       stream->fp = fopen_utf8(path, mode_str);
 
       if (!stream->fp)
diff --git a/retroarch.c b/retroarch.c
index 1f1c801b06..9a48ec767a 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1222,7 +1222,7 @@ static void retroarch_main_init_media(void)
  *
  * Initializes the program.
  *
- * Returns: 0 on success, otherwise 1 if there was an error.
+ * Returns: true on success, otherwise false if there was an error.
  **/
 bool retroarch_main_init(int argc, char *argv[])
 {