initial recovery fixes