Fix to failsafe and a few other minor changes