Calibration and benchmark fixes