Endpoint bug fixes