Fix various failures related to Endpoint state