Recovery fixes