Fix dependency convergence.