Tweaks to the destroy portion