Correct some things for restart