More recovery fixes

Change-Id: Id8af85ebefccf13906ccb9e37a120aeea90bce92