Dependency convergence fixes