Tweaks to drop()