Failure recovery improved