Endpoint fixes