Fixes stupid tf calibration bugs introduced/exposed in f77410d