WIP: Plot destruction fixes.