Fix drainage of the calibration routine.
Fix endpoints.