more endpoint fixes