diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 35e50698ccf79eeadb7f980c4feeb72fa7b2d228..e8161581b2af5d27defb649f9a1fcea0150251c1 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -112,7 +112,7 @@ StringXString MeshOptions_String[] = {
 
 StringXString SolverOptions_String[] = {
 #if defined(WIN32) && !defined(__CYGWIN__)
-  { F|O, "SocketName" , opt_solver_socket_name , "127.0.0.1:33791" ,
+  { F|O, "SocketName" , opt_solver_socket_name , "127.0.0.1:44122" ,
 #else
   { F|O, "SocketName" , opt_solver_socket_name , ".gmshsock" ,
 #endif
diff --git a/Fltk/GmshServer.h b/Fltk/GmshServer.h
index a8b2f0c3fdc0841dbd94c5a8bb05a5805ce777d8..ef51edd78b736a3e687afb8762e99be06e29ee36 100644
--- a/Fltk/GmshServer.h
+++ b/Fltk/GmshServer.h
@@ -149,7 +149,7 @@ class GmshServer {
       _portno = -1;
     }
     else{
-      // INET socket
+      // TCP/IP socket
       char *port = strstr(_sockname, ":");
       _portno = atoi(port+1);
     }
diff --git a/Fltk/Message.cpp b/Fltk/Message.cpp
index 550757a9b92a7af0138dca982c58bd1db2744e4b..4391fbef5243363b13caef8455ab929cf2459bf1 100644
--- a/Fltk/Message.cpp
+++ b/Fltk/Message.cpp
@@ -1,4 +1,4 @@
-// $Id: Message.cpp,v 1.69 2006-02-22 19:39:50 geuzaine Exp $
+// $Id: Message.cpp,v 1.70 2006-02-25 05:27:59 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -21,7 +21,6 @@
 
 #if !defined(WIN32) || defined(__CYGWIN__)
 #include <unistd.h>
-#include <signal.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #endif
@@ -31,6 +30,8 @@
 #define RUSAGE_CHILDREN -1
 #endif
 
+#include <signal.h>
+
 #include "Gmsh.h"
 #include "GmshUI.h"
 #include "GmshVersion.h"
@@ -47,7 +48,6 @@ extern Context_T CTX;
 
 void Signal(int sig_num)
 {
-#if !defined(WIN32) || defined(__CYGWIN__)
   switch (sig_num) {
   case SIGSEGV:
     Msg(FATAL1, "Segmentation violation (invalid memory reference)");
@@ -67,7 +67,6 @@ void Signal(int sig_num)
     Msg(FATAL, "Unknown signal");
     break;
   }
-#endif
 }
 
 // General purpose message routine
diff --git a/Fltk/Solvers.cpp b/Fltk/Solvers.cpp
index 5e41710b36112d7b4db0b6eb4f545eb5e597a508..1111505dbc8c64fbc1e61faf7698934d6b0ede5f 100644
--- a/Fltk/Solvers.cpp
+++ b/Fltk/Solvers.cpp
@@ -1,4 +1,4 @@
-// $Id: Solvers.cpp,v 1.48 2006-02-24 22:07:06 geuzaine Exp $
+// $Id: Solvers.cpp,v 1.49 2006-02-25 05:27:59 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -106,15 +106,17 @@ int Solver(int num, char *args)
   }
 
   if(!strstr(CTX.solver.socket_name, ":")){
-    // file socket
+    // Unix socket
     if(num >= 0)
       sprintf(tmp, "%s%s-%d", CTX.home_dir, CTX.solver.socket_name, num);
     else
       sprintf(tmp, "%s%s", CTX.home_dir, CTX.solver.socket_name);
     FixWindowsPath(tmp, sockname);
   }
-  else
+  else{
+    // TCP/IP socket
     strcpy(sockname, CTX.solver.socket_name);
+  }
 
   if(num >= 0){
     sprintf(tmp, "\"%s\"", sockname);