Some recovery init fixes