Tweaks for diffraction calibration