More endpoints fix ups