Some recovery init fixes
More Recovery init fixes