Add recovery option
Fix recovery errors