diff --git a/include/pe_image.h b/include/pe_image.h
index e9a4ca2f0023aab635ebd7ec6dbbab3a00c64cf7..cbd94cc0d9151c185679b8dc99fdf0efb2da6772 100644
--- a/include/pe_image.h
+++ b/include/pe_image.h
@@ -29,7 +29,6 @@ extern int PE_unloadImage(HMODULE32 hModule);
 extern FARPROC32 PE_FindExportedFunction( 
 	struct _PDB32 *process,struct _wine_modref *wm, LPCSTR funcName, BOOL32 snoop
 );
-extern void my_wcstombs(char * result, u_short * source, int len);
 extern BOOL32 PE_EnumResourceTypes32A(HMODULE32,ENUMRESTYPEPROC32A,LONG);
 extern BOOL32 PE_EnumResourceTypes32W(HMODULE32,ENUMRESTYPEPROC32W,LONG);
 extern BOOL32 PE_EnumResourceNames32A(HMODULE32,LPCSTR,ENUMRESNAMEPROC32A,LONG);
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index b30e8f663156b77fc3d90c8dc25064fa1ad2b9f5..afe1dcd07ba5e3fda09a18753153576c5e3ffbce 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -2024,7 +2024,16 @@ INT32 WINAPI LCMapString32A(
   {
     FIXME(string,"(0x%04lx,0x%08lx,%p,%d,%p,%d): "
 	  "unimplemented flags: 0x%08lx\n",
-	  lcid,mapflags,srcstr,srclen,dststr,dstlen,mapflags);
+	  lcid,
+  	  mapflags&~(LCMAP_UPPERCASE | LCMAP_LOWERCASE | LCMAP_SORTKEY |
+		     NORM_IGNORECASE | NORM_IGNORENONSPACE | SORT_STRINGSORT |
+		     NORM_IGNOREWIDTH),
+	  srcstr,
+	  srclen,
+	  dststr,
+	  dstlen,
+	  mapflags
+     );
   }
 
   if ( !(mapflags & LCMAP_SORTKEY) )
diff --git a/win32/file.c b/win32/file.c
index 43f22b80cc138f8957c9bc487c8e9f4cf0d1f5a9..df2e63a68660f9593dd5c1290079d25db3025928 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -154,7 +154,7 @@ HFILE32 WINAPI CreateFile32A(LPCSTR filename, DWORD access, DWORD sharing,
         filename += 4;
 	if (!strncmp(filename, "UNC", 3))
 	{
-            FIXME(file, "UNC names not supported.\n");
+            FIXME(file, "UNC name (%s) not supported.\n",filename);
             SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
             return HFILE_ERROR32;
 	}