Fix copypasta errors in long-running scenarios