Improved connection management on events service.