More dependency convergence fixes