RestartFailed: some fixes + more comments