Addressed comments on recover fix.