endpoint fixes