diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c
index b3ce3764262..f402b2c3f14 100644
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -1060,7 +1060,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
      */
     size = DocumentPropertiesW(0, -1, pi->pPrinterName, NULL, NULL, 0);
     if(size < 0) {
-        FIXME("DocumentPropertiesW on printer '%s' fails\n", pi->pPrinterName);
+        FIXME("DocumentPropertiesW on printer '%s' fails\n", debugstr_w(pi->pPrinterName));
 	size = sizeof(DEVMODEW);
     }
     if(pi->pDevMode)
@@ -1069,7 +1069,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
 	dmW = HeapAlloc(GetProcessHeap(), 0, size);
 	dmW->dmSize = size;
 	if (0>DocumentPropertiesW(0,-1,pi->pPrinterName,dmW,NULL,DM_OUT_BUFFER)) {
-	    ERR("DocumentPropertiesW on printer '%s' failed!\n", pi->pPrinterName);
+	    ERR("DocumentPropertiesW on printer '%s' failed!\n", debugstr_w(pi->pPrinterName));
 	    SetLastError(ERROR_UNKNOWN_PRINTER_DRIVER);
 	    return 0;
 	}
diff --git a/programs/avitools/aviinfo.c b/programs/avitools/aviinfo.c
index ca0d9cdce2c..1f717f8735c 100644
--- a/programs/avitools/aviinfo.c
+++ b/programs/avitools/aviinfo.c
@@ -46,9 +46,9 @@ HRESULT (WINAPI *fnAVIStreamInfo)(PAVISTREAM iface,AVISTREAMINFO *afi,LONG size)
 
 #define XX(x) fn##x = (void*)GetProcAddress(avifil32,#x);assert(fn##x);
 #ifdef UNICODE
-# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x##"W");assert(fn##x);
+# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x"W");assert(fn##x);
 #else
-# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x##"A");assert(fn##x);
+# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x"A");assert(fn##x);
 #endif
 	/* Non character dependent routines: */
 	XX (AVIFileInit);
@@ -80,13 +80,13 @@ HRESULT (WINAPI *fnAVIStreamInfo)(PAVISTREAM iface,AVISTREAMINFO *afi,LONG size)
     }
     fprintf(stderr,"AVI File Info:\n");
     fprintf(stderr,"\tdwMaxBytesPerSec: %ld\n",afi.dwMaxBytesPerSec);
-#define FF(x) if (afi.dwFlags & AVIFILEINFO_##x) fprintf(stderr,#x##",");
+#define FF(x) if (afi.dwFlags & AVIFILEINFO_##x) fprintf(stderr,#x",");
     fprintf(stderr,"\tdwFlags: 0x%lx (",afi.dwFlags);
     FF(HASINDEX);FF(MUSTUSEINDEX);FF(ISINTERLEAVED);FF(WASCAPTUREFILE);
     FF(COPYRIGHTED);
     fprintf(stderr,")\n");
 #undef FF
-#define FF(x) if (afi.dwCaps & AVIFILECAPS_##x) fprintf(stderr,#x##",");
+#define FF(x) if (afi.dwCaps & AVIFILECAPS_##x) fprintf(stderr,#x",");
     fprintf(stderr,"\tdwCaps: 0x%lx (",afi.dwCaps);
     FF(CANREAD);FF(CANWRITE);FF(ALLKEYFRAMES);FF(NOCOMPRESSION);
     fprintf(stderr,")\n");
diff --git a/programs/avitools/aviplay.c b/programs/avitools/aviplay.c
index 140eb1deda5..b013ff32f26 100644
--- a/programs/avitools/aviplay.c
+++ b/programs/avitools/aviplay.c
@@ -77,9 +77,9 @@ HRESULT (WINAPI *fnAVIStreamGetFrameClose)(PGETFRAME pg);
 
 #define XX(x) fn##x = (void*)GetProcAddress(avifil32,#x);assert(fn##x);
 #ifdef UNICODE
-# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x##"W");assert(fn##x);
+# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x"W");assert(fn##x);
 #else
-# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x##"A");assert(fn##x);
+# define XXT(x) fn##x = (void*)GetProcAddress(avifil32,#x"A");assert(fn##x);
 #endif
 	/* non character dependend routines: */
 	XX (AVIFileInit);