Enhance device calibration