Circleref fix, more dep updates