Tweaks to drop dead/non-seen devices efficiently