Recovery related changes