Fix some more multi-target drop issues