Fixed errors in new Endpoint Enhancements