Fix up the endpoints