Dep cycle fixes