diff --git a/lib/cpp/src/Makefile.am b/lib/cpp/src/Makefile.am
deleted file mode 100644
index 3d07cb4..0000000
--- a/lib/cpp/src/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = concurrency
diff --git a/lib/cpp/src/concurrency/Makefile.am b/lib/cpp/src/concurrency/Makefile.am
deleted file mode 100644
index c4d0829..0000000
--- a/lib/cpp/src/concurrency/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-lib_LTLIBRARIES = libconcurrency.la
-
-# Define the source file for the module
-
-libconcurrency_la_SOURCES = Monitor.cc \
-			   PosixThreadFactory.cc \
-			   ThreadManager.cc \
-			   TimerManager.cc
-
-
diff --git a/lib/cpp/src/concurrency/test/Tests.cc b/lib/cpp/src/concurrency/test/Tests.cc
index 2174bf4..19e1f4a 100644
--- a/lib/cpp/src/concurrency/test/Tests.cc
+++ b/lib/cpp/src/concurrency/test/Tests.cc
@@ -56,9 +56,9 @@
 
     std::cout << "ThreadManager tests..." << std::endl;
 
-    size_t workerCount = 10;
+    size_t workerCount = 100;
 
-    size_t taskCount = 10000;
+    size_t taskCount = 100000;
 
     long long delay = 10LL;
 
diff --git a/lib/cpp/src/concurrency/test/ThreadManagerTests.h b/lib/cpp/src/concurrency/test/ThreadManagerTests.h
index 72d6777..6132571 100644
--- a/lib/cpp/src/concurrency/test/ThreadManagerTests.h
+++ b/lib/cpp/src/concurrency/test/ThreadManagerTests.h
@@ -49,7 +49,7 @@
 	  error*= -1.0;
 	}
 
-	if(error > .10) {
+	if(error > .20) {
 	  
 	  assert(false);
 	}
diff --git a/lib/cpp/src/transport/TSocket.cc b/lib/cpp/src/transport/TSocket.cc
index 3471755..55f512e 100644
--- a/lib/cpp/src/transport/TSocket.cc
+++ b/lib/cpp/src/transport/TSocket.cc
@@ -162,9 +162,16 @@
   uint32_t sent = 0;
     
   while (sent < len) {
+
+    int flags = 0;
+
+    #if HAVE_BITS_SOCKET_H
     // Note the use of MSG_NOSIGNAL to suppress SIGPIPE errors, instead we
     // check for the EPIPE return condition and close the socket in that case
-    int b = send(socket_, buf + sent, len - sent, MSG_NOSIGNAL);
+    flags |= MSG_NOSIGNAL;
+    #endif // HAVE_BITS_SOCKET_H
+
+    int b = send(socket_, buf + sent, len - sent, flags);
     ++g_socket_syscalls;
 
     // Fail on a send error