Fix recovery and build