More dragging bug fixes.