Make the convergence checker more robust