Completed the eventpoll enhancements