recovery: fixes and updates
By @percy-g2