failsafe improvements