fixes for recovery

Change-Id: I6055ecafb0e5e603e61149cbc0e365382b986f04