Calib: Improvements for convergence factor handling