diff --git a/src/lib/server/CClientProxy.cpp b/src/lib/server/CClientProxy.cpp
index 52feb56e..895b4d11 100644
--- a/src/lib/server/CClientProxy.cpp
+++ b/src/lib/server/CClientProxy.cpp
@@ -61,7 +61,6 @@ CClientProxy::getStream() const
 CEvent::Type
 CClientProxy::getReadyEvent()
 {
-	LOG((CLOG_DEBUG4 "getReadyEvent"));
 	return EVENTQUEUE->registerTypeOnce(s_readyEvent,
 							"CClientProxy::ready");
 }
@@ -69,7 +68,6 @@ CClientProxy::getReadyEvent()
 CEvent::Type
 CClientProxy::getDisconnectedEvent()
 {
-	LOG((CLOG_DEBUG4 "getDisconnectedEvent"));
 	return EVENTQUEUE->registerTypeOnce(s_disconnectedEvent,
 							"CClientProxy::disconnected");
 }
@@ -77,7 +75,6 @@ CClientProxy::getDisconnectedEvent()
 CEvent::Type
 CClientProxy::getClipboardChangedEvent()
 {
-	LOG((CLOG_DEBUG4 "getClipboardChangedEvent"));
 	return EVENTQUEUE->registerTypeOnce(s_clipboardChangedEvent,
 							"CClientProxy::clipboardChanged");
 }
diff --git a/src/lib/server/CClientProxy1_3.cpp b/src/lib/server/CClientProxy1_3.cpp
index 6a76ffd5..fcf452ff 100644
--- a/src/lib/server/CClientProxy1_3.cpp
+++ b/src/lib/server/CClientProxy1_3.cpp
@@ -89,7 +89,6 @@ CClientProxy1_3::addHeartbeatTimer()
 {
 	// create and install a timer to periodically send keep alives
 	if (m_keepAliveRate > 0.0) {
-		LOG((CLOG_DEBUG4 "addHeartbeatTimer"));
 		m_keepAliveTimer = EVENTQUEUE->newTimer(m_keepAliveRate, NULL);
 		EVENTQUEUE->adoptHandler(CEvent::kTimer, m_keepAliveTimer,
 							new TMethodEventJob<CClientProxy1_3>(this,
@@ -105,7 +104,6 @@ CClientProxy1_3::removeHeartbeatTimer()
 {
 	// remove the timer that sends keep alives periodically
 	if (m_keepAliveTimer != NULL) {
-		LOG((CLOG_DEBUG4 "removeHeartbeatTimer"));
 		EVENTQUEUE->removeHandler(CEvent::kTimer, m_keepAliveTimer);
 		EVENTQUEUE->deleteTimer(m_keepAliveTimer);
 		m_keepAliveTimer = NULL;
diff --git a/src/lib/server/CClientProxyUnknown.cpp b/src/lib/server/CClientProxyUnknown.cpp
index bbd0c638..62b19064 100644
--- a/src/lib/server/CClientProxyUnknown.cpp
+++ b/src/lib/server/CClientProxyUnknown.cpp
@@ -47,8 +47,7 @@ CClientProxyUnknown::CClientProxyUnknown(synergy::IStream* stream, double timeou
 	m_server(server)
 {
 	assert(m_server != NULL);
-	
-	LOG((CLOG_DEBUG4 "CClientProxyUnknown"));
+
 	EVENTQUEUE->adoptHandler(CEvent::kTimer, this,
 							new TMethodEventJob<CClientProxyUnknown>(this,
 								&CClientProxyUnknown::handleTimeout, NULL));
@@ -86,7 +85,6 @@ CClientProxyUnknown::orphanClientProxy()
 CEvent::Type
 CClientProxyUnknown::getSuccessEvent()
 {
-	LOG((CLOG_DEBUG4 "getSuccessEvent"));
 	return EVENTQUEUE->registerTypeOnce(s_successEvent,
 							"CClientProxy::success");
 }
@@ -94,7 +92,6 @@ CClientProxyUnknown::getSuccessEvent()
 CEvent::Type
 CClientProxyUnknown::getFailureEvent()
 {
-	LOG((CLOG_DEBUG4 "getFailureEvent"));
 	return EVENTQUEUE->registerTypeOnce(s_failureEvent,
 							"CClientProxy::failure");
 }
@@ -104,7 +101,6 @@ CClientProxyUnknown::sendSuccess()
 {
 	m_ready = true;
 	removeTimer();
-	LOG((CLOG_DEBUG4 "sendSuccess"));
 	EVENTQUEUE->addEvent(CEvent(getSuccessEvent(), this));
 }
 
@@ -116,7 +112,6 @@ CClientProxyUnknown::sendFailure()
 	m_ready = false;
 	removeHandlers();
 	removeTimer();
-	LOG((CLOG_DEBUG4 "sendFailure"));
 	EVENTQUEUE->addEvent(CEvent(getFailureEvent(), this));
 }
 
@@ -124,8 +119,7 @@ void
 CClientProxyUnknown::addStreamHandlers()
 {
 	assert(m_stream != NULL);
-	
-	LOG((CLOG_DEBUG4 "addStreamHandlers"));
+
 	EVENTQUEUE->adoptHandler(m_stream->getInputReadyEvent(),
 							m_stream->getEventTarget(),
 							new TMethodEventJob<CClientProxyUnknown>(this,
@@ -148,8 +142,7 @@ void
 CClientProxyUnknown::addProxyHandlers()
 {
 	assert(m_proxy != NULL);
-	
-	LOG((CLOG_DEBUG4 "addProxyHandlers"));
+
 	EVENTQUEUE->adoptHandler(CClientProxy::getReadyEvent(),
 							m_proxy,
 							new TMethodEventJob<CClientProxyUnknown>(this,
@@ -164,7 +157,6 @@ void
 CClientProxyUnknown::removeHandlers()
 {
 	if (m_stream != NULL) {
-		LOG((CLOG_DEBUG4 "removeHandlers"));
 		EVENTQUEUE->removeHandler(m_stream->getInputReadyEvent(),
 							m_stream->getEventTarget());
 		EVENTQUEUE->removeHandler(m_stream->getOutputErrorEvent(),
@@ -175,7 +167,6 @@ CClientProxyUnknown::removeHandlers()
 							m_stream->getEventTarget());
 	}
 	if (m_proxy != NULL) {
-		LOG((CLOG_DEBUG4 "removeHandlers"));
 		EVENTQUEUE->removeHandler(CClientProxy::getReadyEvent(),
 							m_proxy);
 		EVENTQUEUE->removeHandler(CClientProxy::getDisconnectedEvent(),
@@ -187,7 +178,6 @@ void
 CClientProxyUnknown::removeTimer()
 {
 	if (m_timer != NULL) {
-		LOG((CLOG_DEBUG4 "removeTimer"));
 		EVENTQUEUE->deleteTimer(m_timer);
 		EVENTQUEUE->removeHandler(CEvent::kTimer, this);
 		m_timer = NULL;
@@ -224,8 +214,7 @@ CClientProxyUnknown::handleData(const CEvent&, void*)
 		// may install its own handlers and we don't want to accidentally
 		// remove those later.
 		removeHandlers();
-		
-		LOG((CLOG_DEBUG4 "handleData"));
+
 		// create client proxy for highest version supported by the client
 		if (major == 1) {
 			switch (minor) {
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 668f99ed..a3b38988 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -53,6 +53,7 @@ if (UNIX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pipe")
 	
 	if (APPLE)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -arch i386")
 		if (DARWIN_VERSION GREATER 10)
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-compare")
 		endif()