Notes and fix in get_endpoint