Further fixes to remove calibration