Fix some issues with the dragndrop.