more fixes from the endoint var change