Recovery: monitor improvements and bug fixes