diff --git a/uppsrc/CtrlCore/Win32Gui.h b/uppsrc/CtrlCore/Win32Gui.h
index eadbed08a..6b62a4232 100644
--- a/uppsrc/CtrlCore/Win32Gui.h
+++ b/uppsrc/CtrlCore/Win32Gui.h
@@ -1,4 +1,5 @@
 #define GUI_WIN
+#define GUI_WIN32
 
 NAMESPACE_UPP
 
diff --git a/uppsrc/CtrlLib/FileSel.cpp b/uppsrc/CtrlLib/FileSel.cpp
index a5a38086c..88ea9c9a8 100644
--- a/uppsrc/CtrlLib/FileSel.cpp
+++ b/uppsrc/CtrlLib/FileSel.cpp
@@ -341,7 +341,7 @@ bool Load(FileList& list, const String& dir, const char *patterns, bool dirs,
 				img = isdrive ? PosixGetDriveImage(fi.filename, false)
 				              : GetFileIcon(dir, fi.filename, fi.is_directory, fi.unix_mode & 0111, false);
 			#endif
-			#ifdef GUI_WIN32
+			#ifdef GUI_WIN
 //				Image img = lazyicons ? fi.is_directory ? CtrlImg::Dir() : CtrlImg::File()
 //				                      : GetFileIcon(AppendFileName(dir, fi.filename), fi.is_directory, fi.unix_mode & 0111, false);
 				img = GetFileIcon(AppendFileName(dir, fi.filename), fi.is_directory, false, false, lazyicons);
@@ -1218,7 +1218,7 @@ Image GetDirIcon(const String& s)
 #ifdef GUI_X11
 	img = GetFileIcon(GetFileFolder(s), GetFileName(s), true, false, false);
 #endif
-#ifdef GUI_WIN32
+#ifdef GUI_WIN
 	if((byte)*s.Last() == 255)
 		img = CtrlImg::Network();
 	else
diff --git a/uppsrc/XmlRpc/Server.cpp b/uppsrc/XmlRpc/Server.cpp
index 5378de012..75e010358 100644
--- a/uppsrc/XmlRpc/Server.cpp
+++ b/uppsrc/XmlRpc/Server.cpp
@@ -167,7 +167,7 @@ bool XmlRpcPerform(Socket& http, const char *group)
 				response <<
 					"HTTP/1.0 200 OK\r\n"
 					"Date: " << ts << "\r\n"
-					"Server: U++\r\n"
+					"Server: U++ XMLRPC server\r\n"
 					"Content-Length: " << r.GetCount() << "\r\n"
 					"Connection: close\r\n"
 					"Content-Type: text/xml\r\n\r\n"