Fixed errors arising from compiling Calibration