small tweaks for destroy