Domain destruction fixes