Recovery:Fixes and Update