Fix the various failures related to Endpoint state