diff --git a/scp.c b/scp.c
index 9060ea05..7ed77b04 100644
--- a/scp.c
+++ b/scp.c
@@ -7878,11 +7878,11 @@ if ((dptr = find_dev_from_unit (uptr)) == NULL)
 if ((uptr->flags & UNIT_BUF) && (uptr->filebuf)) {
     uint32 cap = (uptr->hwmark + dptr->aincr - 1) / dptr->aincr;
     if (uptr->hwmark && ((uptr->flags & UNIT_RO) == 0)) {
-        sim_messagef (SCPE_OK, "%s: writing buffer to file: %s\n", sim_uname (dptr), uptr->filename);
+        sim_messagef (SCPE_OK, "%s: writing buffer to file: %s\n", sim_uname (uptr), uptr->filename);
         rewind (uptr->fileref);
         sim_fwrite (uptr->filebuf, SZ_D (dptr), cap, uptr->fileref);
         if (ferror (uptr->fileref))
-            sim_printf ("%s: I/O error - %s", sim_uname (dptr), strerror (errno));
+            sim_printf ("%s: I/O error - %s", sim_uname (uptr), strerror (errno));
         }
     if (uptr->flags & UNIT_MUSTBUF) {                   /* dyn alloc? */
         free (uptr->filebuf);                           /* free buf */
diff --git a/sim_fio.h b/sim_fio.h
index 715fe1e9..a632e5fd 100644
--- a/sim_fio.h
+++ b/sim_fio.h
@@ -171,6 +171,7 @@ size_t sim_strlcpy (char *dst, const char *src, size_t size);
 #ifndef strcasecmp
 #define strcasecmp(str1, str2) sim_strcasecmp ((str1), (str2))
 #endif
+int sim_strwhitecasecmp (const char *string1, const char *string2, t_bool casecmp);
 
 
 #ifdef  __cplusplus