More endpoint fixes