Some small changes in calib-hal.