Rich adjustment of the latest fix to missing calibration files