FIX: Fix units for calibration