Few fixes to calibration to get it working with new libraries.