r219: Fixed some problems with the drag-and-drop: