Fix doDrop dupe bugs