More work on xrecover