Added some epoll handling