Calibrations MVCed and adjusted class loading