diff --git a/src/Socket.cpp b/src/Socket.cpp
index 5d222b1..56ceba3 100644
--- a/src/Socket.cpp
+++ b/src/Socket.cpp
@@ -20,16 +20,16 @@ namespace fr
     {
             if(instance_count == 0)
             {
-                //Disable SIGPIPE
-                signal(SIGPIPE, SIG_IGN);
-
                 #ifdef _WIN32
-                int wsa_result = WSAStartup(MAKEWORD(2, 2), &wsaData);
-                if(wsa_result != 0)
-                {
-                    std::cout << "Failed to initialise WSA." << std::endl;
-                    return;
-                }
+                    int wsa_result = WSAStartup(MAKEWORD(2, 2), &wsaData);
+                    if(wsa_result != 0)
+                    {
+                        std::cout << "Failed to initialise WSA." << std::endl;
+                        return;
+                    }
+                #else
+                    //Disable SIGPIPE
+                    signal(SIGPIPE, SIG_IGN);
                 #endif // _WIN32
             }
 			instance_count++;
diff --git a/src/TcpSocket.cpp b/src/TcpSocket.cpp
index aa8ab77..2294a98 100644
--- a/src/TcpSocket.cpp
+++ b/src/TcpSocket.cpp
@@ -57,7 +57,7 @@ namespace fr
         received = 0;
 
         //Read RECV_CHUNK_SIZE bytes into the recv buffer
-        ssize_t status = ::recv(socket_descriptor, data, buffer_size, 0);
+        ssize_t status = ::recv(socket_descriptor, (char*)data, buffer_size, 0);
 
         if(status > 0)
         {