Drag&Drop fixes