More Recovery init fixes