More tweaking of self_destruct