calibration / registration fixes