diff -Nraupb nmap/nbase/nbase_str.c nmap-fixed/nbase/nbase_str.c
--- nmap/nbase/nbase_str.c	2008-04-09 02:28:50.000000000 +0200
+++ nmap-fixed/nbase/nbase_str.c	2008-04-11 01:14:41.000000000 +0200
@@ -205,7 +205,7 @@ static int find_last_path_separator(cons
   p = path + strlen(path) - 1;
   while (p >= path) {
     if (strchr(PATH_SEPARATORS, *p) != NULL)
-      return p - path;
+      return (int)(p - path);
     p--;
   }
 
diff -Nraupb nmap/nsock/src/nsock_connect.c nmap-fixed/nsock/src/nsock_connect.c
--- nmap/nsock/src/nsock_connect.c	2008-04-09 02:28:45.000000000 +0200
+++ nmap-fixed/nsock/src/nsock_connect.c	2008-04-11 01:14:41.000000000 +0200
@@ -103,7 +103,7 @@ static void nsock_connect_internal(mspoo
     nse->iod->peerlen = sslen;
     nse->iod->lastproto = proto;
 
-    if ((res = connect(nse->iod->sd, (struct sockaddr *) ss, sslen)) != -1) {
+    if ((res = connect(nse->iod->sd, (struct sockaddr *) ss, (int)sslen)) != -1) {
       nse->event_done = 1;
       nse->status = NSE_STATUS_SUCCESS;
     }
diff -Nraupb nmap/traceroute.cc nmap-fixed/traceroute.cc
--- nmap/traceroute.cc	2008-04-09 02:28:40.000000000 +0200
+++ nmap-fixed/traceroute.cc	2008-04-11 01:14:41.000000000 +0200
@@ -327,7 +327,7 @@ Traceroute::getTracePort (u8 proto, Targ
     u16 filtered_port = 1;
     u16 port = 0;
     int state = -1;
-    struct Port *np;
+    class Port *np;
 
     /* Use the first specified port for ping traceroutes */
     if (o.pingscan) {