recovery bug fixes