Fixed corner cases in RecoveryDevice