Calibration improvements/tweaks