FIX: A few errors and omissions from the calibration process