Dep fixes