diff --git a/src/jsonrpccpp/client/connectors/tcpsocketclient.cpp b/src/jsonrpccpp/client/connectors/tcpsocketclient.cpp
index 1eeda38f..32ee9dd7 100644
--- a/src/jsonrpccpp/client/connectors/tcpsocketclient.cpp
+++ b/src/jsonrpccpp/client/connectors/tcpsocketclient.cpp
@@ -9,7 +9,7 @@
 
 #include "tcpsocketclient.h"
 
-#ifdef __WIN32__
+#ifdef _WIN32
 #include "windowstcpsocketclient.h"
 #else
 #include "linuxtcpsocketclient.h"
@@ -20,7 +20,7 @@ using namespace std;
 
 TcpSocketClient::TcpSocketClient(const std::string &ipToConnect,
                                  const unsigned int &port) {
-#ifdef __WIN32__
+#ifdef _WIN32
   this->realSocket = new WindowsTcpSocketClient(ipToConnect, port);
 #else
   this->realSocket = new LinuxTcpSocketClient(ipToConnect, port);
diff --git a/src/jsonrpccpp/client/connectors/windowstcpsocketclient.cpp b/src/jsonrpccpp/client/connectors/windowstcpsocketclient.cpp
index de886f5f..03be514d 100644
--- a/src/jsonrpccpp/client/connectors/windowstcpsocketclient.cpp
+++ b/src/jsonrpccpp/client/connectors/windowstcpsocketclient.cpp
@@ -133,8 +133,8 @@ SOCKET WindowsTcpSocketClient::Connect() throw(JsonRpcException) {
     hints.ai_family = AF_INET;
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_protocol = IPPROTO_TCP;
-    char port[6];
-    port = itoa(this->port, port, 10);
+	char port[6];
+	itoa(this->port, port, 10);
     DWORD retval =
         getaddrinfo(this->hostToConnect.c_str(), port, &hints, &result);
     if (retval != 0)
diff --git a/src/jsonrpccpp/server/connectors/windowstcpsocketserver.cpp b/src/jsonrpccpp/server/connectors/windowstcpsocketserver.cpp
index 51e0d085..42331c1e 100644
--- a/src/jsonrpccpp/server/connectors/windowstcpsocketserver.cpp
+++ b/src/jsonrpccpp/server/connectors/windowstcpsocketserver.cpp
@@ -181,7 +181,9 @@ DWORD WINAPI WindowsTcpSocketServer::GenerateResponse(LPVOID lp_data) {
       request.append(buffer, nbytes);
     }
   } while (request.find(DELIMITER_CHAR) == string::npos);
-  instance->OnRequest(request, reinterpret_cast<void *>(connection_fd));
+  std::string response;
+  instance->ProcessRequest(request, response);
+  instance->SendResponse(response, reinterpret_cast<void *>(connection_fd));
   CloseHandle(GetCurrentThread());
   return 0; // DO NOT USE ExitThread function here! ExitThread does not call
             // destructors for allocated objects and therefore it would lead to