Cleanup of DragAndDrop simultaneous drag patch

Fixes issues pointed out by @bitiotic