More updates for gevent support