diff --git a/src/lib/server/CClientProxy.cpp b/src/lib/server/CClientProxy.cpp
index 895b4d11..52feb56e 100644
--- a/src/lib/server/CClientProxy.cpp
+++ b/src/lib/server/CClientProxy.cpp
@@ -61,6 +61,7 @@ CClientProxy::getStream() const
 CEvent::Type
 CClientProxy::getReadyEvent()
 {
+	LOG((CLOG_DEBUG4 "getReadyEvent"));
 	return EVENTQUEUE->registerTypeOnce(s_readyEvent,
 							"CClientProxy::ready");
 }
@@ -68,6 +69,7 @@ CClientProxy::getReadyEvent()
 CEvent::Type
 CClientProxy::getDisconnectedEvent()
 {
+	LOG((CLOG_DEBUG4 "getDisconnectedEvent"));
 	return EVENTQUEUE->registerTypeOnce(s_disconnectedEvent,
 							"CClientProxy::disconnected");
 }
@@ -75,6 +77,7 @@ 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 fcf452ff..6a76ffd5 100644
--- a/src/lib/server/CClientProxy1_3.cpp
+++ b/src/lib/server/CClientProxy1_3.cpp
@@ -89,6 +89,7 @@ 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,
@@ -104,6 +105,7 @@ 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 62b19064..bbd0c638 100644
--- a/src/lib/server/CClientProxyUnknown.cpp
+++ b/src/lib/server/CClientProxyUnknown.cpp
@@ -47,7 +47,8 @@ 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));
@@ -85,6 +86,7 @@ CClientProxyUnknown::orphanClientProxy()
 CEvent::Type
 CClientProxyUnknown::getSuccessEvent()
 {
+	LOG((CLOG_DEBUG4 "getSuccessEvent"));
 	return EVENTQUEUE->registerTypeOnce(s_successEvent,
 							"CClientProxy::success");
 }
@@ -92,6 +94,7 @@ CClientProxyUnknown::getSuccessEvent()
 CEvent::Type
 CClientProxyUnknown::getFailureEvent()
 {
+	LOG((CLOG_DEBUG4 "getFailureEvent"));
 	return EVENTQUEUE->registerTypeOnce(s_failureEvent,
 							"CClientProxy::failure");
 }
@@ -101,6 +104,7 @@ CClientProxyUnknown::sendSuccess()
 {
 	m_ready = true;
 	removeTimer();
+	LOG((CLOG_DEBUG4 "sendSuccess"));
 	EVENTQUEUE->addEvent(CEvent(getSuccessEvent(), this));
 }
 
@@ -112,6 +116,7 @@ CClientProxyUnknown::sendFailure()
 	m_ready = false;
 	removeHandlers();
 	removeTimer();
+	LOG((CLOG_DEBUG4 "sendFailure"));
 	EVENTQUEUE->addEvent(CEvent(getFailureEvent(), this));
 }
 
@@ -119,7 +124,8 @@ void
 CClientProxyUnknown::addStreamHandlers()
 {
 	assert(m_stream != NULL);
-
+	
+	LOG((CLOG_DEBUG4 "addStreamHandlers"));
 	EVENTQUEUE->adoptHandler(m_stream->getInputReadyEvent(),
 							m_stream->getEventTarget(),
 							new TMethodEventJob<CClientProxyUnknown>(this,
@@ -142,7 +148,8 @@ void
 CClientProxyUnknown::addProxyHandlers()
 {
 	assert(m_proxy != NULL);
-
+	
+	LOG((CLOG_DEBUG4 "addProxyHandlers"));
 	EVENTQUEUE->adoptHandler(CClientProxy::getReadyEvent(),
 							m_proxy,
 							new TMethodEventJob<CClientProxyUnknown>(this,
@@ -157,6 +164,7 @@ void
 CClientProxyUnknown::removeHandlers()
 {
 	if (m_stream != NULL) {
+		LOG((CLOG_DEBUG4 "removeHandlers"));
 		EVENTQUEUE->removeHandler(m_stream->getInputReadyEvent(),
 							m_stream->getEventTarget());
 		EVENTQUEUE->removeHandler(m_stream->getOutputErrorEvent(),
@@ -167,6 +175,7 @@ CClientProxyUnknown::removeHandlers()
 							m_stream->getEventTarget());
 	}
 	if (m_proxy != NULL) {
+		LOG((CLOG_DEBUG4 "removeHandlers"));
 		EVENTQUEUE->removeHandler(CClientProxy::getReadyEvent(),
 							m_proxy);
 		EVENTQUEUE->removeHandler(CClientProxy::getDisconnectedEvent(),
@@ -178,6 +187,7 @@ void
 CClientProxyUnknown::removeTimer()
 {
 	if (m_timer != NULL) {
+		LOG((CLOG_DEBUG4 "removeTimer"));
 		EVENTQUEUE->deleteTimer(m_timer);
 		EVENTQUEUE->removeHandler(CEvent::kTimer, this);
 		m_timer = NULL;
@@ -214,7 +224,8 @@ 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) {