Some small epoll changes