bugfixes for calibrator