Two changes to prevent deadlocks - only downside is possible calibrations at extremely high load.