diff --git a/src/BuildTiles/Parallel/Makefile.am b/src/BuildTiles/Parallel/Makefile.am
index c37de193..71ed97c1 100644
--- a/src/BuildTiles/Parallel/Makefile.am
+++ b/src/BuildTiles/Parallel/Makefile.am
@@ -8,7 +8,7 @@ fgfs_tools_server_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml $(network_LIBS)
 
 fgfs_tools_client_SOURCES = client.cxx
 
-fgfs_tools_client_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml $(network_LIBS)
+fgfs_tools_client_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml $(network_LIBS) -lplibul
 
 INCLUDES = \
 	-I$(top_srcdir)/src \
diff --git a/src/BuildTiles/Parallel/server.cxx b/src/BuildTiles/Parallel/server.cxx
index 43a7b37a..70a8e7d5 100644
--- a/src/BuildTiles/Parallel/server.cxx
+++ b/src/BuildTiles/Parallel/server.cxx
@@ -346,7 +346,11 @@ void alloc_new_tile( int msgsock, long int next_tile, const string &status_dir )
     if ( send(msgsock, message, length, 0) < 0 ) {
 	perror("Cannot write to stream socket");
     }
+#ifdef _MSC_VER
     closesocket(msgsock);
+#else
+    close(msgsock);
+#endif
     // cout << "process for " << next_tile << " ended" << endl;
 }
 
diff --git a/src/Prep/GSHHS/debug.cxx b/src/Prep/GSHHS/debug.cxx
index 1882676c..e605f3f7 100644
--- a/src/Prep/GSHHS/debug.cxx
+++ b/src/Prep/GSHHS/debug.cxx
@@ -135,7 +135,7 @@ void gen_clipped_polygon( const TGPolygon& shape, const TGPolygon& clip ) {
 
 int main( int argc, char **argv ) {
     struct GSHHS h;
-    struct POINT p;
+    struct GSHHS_POINT p;
     TGPolygon shape, clip;
     double w, e, s, n, area, lon, lat;
     int k, max_east = 270000000;
@@ -187,8 +187,8 @@ int main( int argc, char **argv ) {
 
 	cout << "Loading shape" << endl;
 	for ( k = 0; k < h.n; k++ ) {
-	    if ( gzread(fp, (void *)&p, (unsigned)sizeof(struct POINT)) !=
-		 (unsigned)sizeof(struct POINT) )
+	    if ( gzread(fp, (void *)&p, (unsigned)sizeof(struct GSHHS_POINT)) !=
+		 (unsigned)sizeof(struct GSHHS_POINT) )
 	    {
 		SG_LOG( SG_GENERAL, SG_ALERT, "Error reading file for polygon "
 			<< h.id << " point " << k );