fix some bugs which appeared following the migration of calibration