More fixes for dragging