Fix some convergence issues