diff --git a/ixwebsocket/IXSelectInterruptPipe.cpp b/ixwebsocket/IXSelectInterruptPipe.cpp
index 0518994a..64d6e468 100644
--- a/ixwebsocket/IXSelectInterruptPipe.cpp
+++ b/ixwebsocket/IXSelectInterruptPipe.cpp
@@ -131,7 +131,6 @@ namespace ix
         return ret == 8;
     }
 
-    // TODO: return max uint64_t for errors ?
     uint64_t SelectInterruptPipe::read()
     {
         std::lock_guard<std::mutex> lock(_fildesMutex);
@@ -140,11 +139,11 @@ namespace ix
 
         uint64_t value = 0;
 
-        ssize_t ret = -1;
+        ssize_t readret = -1;
         do
         {
-            ret = ::read(fd, &value, sizeof(value));
-        } while (ret == -1 && errno == EINTR);
+            readret = ::read(fd, &value, sizeof(value));
+        } while (readret == -1 && errno == EINTR);
 
         return value;
     }
diff --git a/ixwebsocket/IXSocketConnect.cpp b/ixwebsocket/IXSocketConnect.cpp
index 6c9a6d5b..38d9b99c 100644
--- a/ixwebsocket/IXSocketConnect.cpp
+++ b/ixwebsocket/IXSocketConnect.cpp
@@ -20,7 +20,6 @@
 #include <linux/in.h>
 #include <linux/tcp.h>
 #endif
-#include <ixwebsocket/IXSelectInterruptFactory.h>
 
 namespace ix
 {
@@ -67,8 +66,7 @@ namespace ix
 
             int timeoutMs = 10;
             bool readyToRead = false;
-            SelectInterruptPtr selectInterrupt = ix::createSelectInterrupt();
-            PollResultType pollResult = Socket::poll(readyToRead, timeoutMs, fd, selectInterrupt);
+            PollResultType pollResult = Socket::poll(readyToRead, timeoutMs, fd, nullptr);
 
             if (pollResult == PollResultType::Timeout)
             {