Fixup for long-running destruction