Fix up recovery paths...