Recovery updates

Change-Id: I0db6d97a1380af396be9937450588b3653f0c1b4