Fixes in recover