Fix recovery errors