Recovery: monitor fixes and usability improvements