diff --git a/src/memu/config.c b/src/memu/config.c
index 7c682ef..aa256ef 100644
--- a/src/memu/config.c
+++ b/src/memu/config.c
@@ -1004,10 +1004,7 @@ static void row_drive_draw (int iDrive, int iState)
         return;
         }
 #endif
-    else
-        {
-        sName[6] = chDrive[iDrive];
-        }
+    sName[6] = chDrive[iDrive];
     file_draw (ROW_DRIVE + iDrive, sName, psCfgDrive[iDrive], iState);
     }
 
diff --git a/src/memu/tape.c b/src/memu/tape.c
index 0be8568..c9c9e51 100644
--- a/src/memu/tape.c
+++ b/src/memu/tape.c
@@ -6,7 +6,7 @@
 #include "diag.h"
 #include "memu.h"
 #include "mem.h"
-#include <stdio.h>
+#include "ff_stdio.h"
 #include <string.h>
 #ifdef WIN32
 #define strcasecmp _stricmp
@@ -228,7 +228,7 @@ void tape_play (void)
                 tape_open_wav (psTapePath);
                 break;
             }
-        if ( pfTapeIn == NULL ) fatal ("Failed to open input tape file");
+        if ( pfTapeIn == NULL ) fatal ("Failed to open input tape file: %s", psTapeIn);
         free ((void *) psTapePath);
         }
     }