diff --git a/src/core/thread.cpp b/src/core/thread.cpp
index db259b67..e498db38 100644
--- a/src/core/thread.cpp
+++ b/src/core/thread.cpp
@@ -20,16 +20,16 @@
 #include "thread.h"
 
 // This is ugly, but I can't help it.
-#define ADD_MSEC_TO_XTIME(__xt, __msec) \
-	{ \
-		__xt.sec += __msec / 1000; \
-		__xt.nsec += (__msec % 1000) * 1000; \
-		if (__xt.nsec > NANOSECONDS_PER_SECOND) \
-		{ \
-			__xt.sec++; \
-			__xt.nsec -= NANOSECONDS_PER_SECOND; \
-		} \
+inline void ADD_MSEC_TO_XTIME(boost::xtime &xt, unsigned msec)
+{
+	xt.sec += msec / 1000;
+	xt.nsec += (msec % 1000) * 1000000;
+	if (xt.nsec > NANOSECONDS_PER_SECOND)
+	{
+		xt.sec++;
+		xt.nsec -= NANOSECONDS_PER_SECOND;
 	}
+}
 
 
 // Helper class for thread creation.
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index 7c97b9c6..975223b2 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -26,6 +26,7 @@
 
 #include "session.h"
 #include "guiwrapper.h"
+#include <net/socket_startup.h>
 
 #include <cstdlib>
 #include <ctime>
@@ -36,6 +37,7 @@ class GuiWrapper;
 
 int main( int argc, char **argv )
 {
+	socket_startup();
 
 	srand( time(0) );
 
@@ -50,5 +52,8 @@ int main( int argc, char **argv )
 	Session theFirst(myGuiInterface);
 	myGuiInterface->setSession(&theFirst);
 
-	return a.exec();
+	int retVal = a.exec();
+
+	socket_cleanup();
+	return retVal;
 }