Fix deps ordering