more epoll changes