diff --git a/src/cdrom/cdrom_image.cc b/src/cdrom/cdrom_image.cc
index 5d728c4fe..a2da43dee 100644
--- a/src/cdrom/cdrom_image.cc
+++ b/src/cdrom/cdrom_image.cc
@@ -991,7 +991,7 @@ int image_open(uint8_t id, wchar_t *fn)
 
 	if (!cdrom_image[id].image_inited || cdrom_image[id].image_changed)
 	{
-		swprintf(cdrom_image[id].image_path, sizeof(cdrom_image[id].image_path)/sizeof(wchar_t), L"%S", fn);
+		swprintf(cdrom_image[id].image_path, sizeof(cdrom_image[id].image_path)/sizeof(wchar_t), L"%ls", fn);
 	}
 
 	if (! wcscasecmp(get_extension_w(fn), L"ISO"))
diff --git a/src/floppy/floppy.c b/src/floppy/floppy.c
index 8771749bb..809de0a88 100644
--- a/src/floppy/floppy.c
+++ b/src/floppy/floppy.c
@@ -156,7 +156,7 @@ void floppy_load(int drive, wchar_t *fn)
                 }
                 c++;
         }
-        pclog("Couldn't load %S %s\n",fn,p);
+        pclog("Couldn't load %ls %s\n",fn,p);
         drive_empty[drive] = 1;
 	fdd_set_head(real_drive(drive), 0);
 	memset(floppyfns[drive], 0, sizeof(floppyfns[drive]));