diff --git a/.gitignore b/.gitignore
index 708c5c05d58..443078d0b59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,6 @@ msvs/BuildRelease
 msvs/Documentation
 tests/tmp/
 
+*.db
+*.opendb
+api/
\ No newline at end of file
diff --git a/src/Win32_Interop/Win32_FDAPI.cpp b/src/Win32_Interop/Win32_FDAPI.cpp
index 3df9af17922..197b79910ef 100644
--- a/src/Win32_Interop/Win32_FDAPI.cpp
+++ b/src/Win32_Interop/Win32_FDAPI.cpp
@@ -671,10 +671,10 @@ int FDAPI_poll(struct pollfd *fds, nfds_t nfds, int timeout) {
 
             nfds_t i;
             for (i = 0; i < nfds; i++) {
-                if (fds[i].fd == INVALID_SOCKET) {
+                if (pollCopy[i].fd == INVALID_SOCKET) {
                     continue;
                 }
-                if (pollCopy[i].fd >= FD_SETSIZE) {
+                if (fds[i].fd >= FD_SETSIZE) {
                     errno = EINVAL;
                     return -1;
                 }
@@ -1001,28 +1001,7 @@ int FDAPI_fileno(FILE *file) {
 }
 
 int FDAPI_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout) {
-    try {
-        if (readfds != NULL) {
-            for (u_int r = 0; r < readfds->fd_count; r++) {
-                readfds->fd_array[r] = RFDMap::getInstance().lookupSocket((RFD) readfds->fd_array[r]);
-            }
-        }
-        if (writefds != NULL) {
-            for (u_int r = 0; r < writefds->fd_count; r++) {
-                writefds->fd_array[r] = RFDMap::getInstance().lookupSocket((RFD) writefds->fd_array[r]);
-            }
-        }
-        if (exceptfds != NULL) {
-            for (u_int r = 0; r < exceptfds->fd_count; r++) {
-                exceptfds->fd_array[r] = RFDMap::getInstance().lookupSocket((RFD) exceptfds->fd_array[r]);
-            }
-        }
-
-        return f_select(nfds, readfds, writefds, exceptfds, timeout);
-    } CATCH_AND_REPORT();
-
-    errno = EBADF;
-    return SOCKET_ERROR;
+    return f_select(nfds, readfds, writefds, exceptfds, timeout);
 }
 
 u_int FDAPI_ntohl(u_int netlong){