Rebuild to fix calibration problems