Improve Recoverability

Ensure better recoverability with these actions.