Fixes in failsafe detection