Improve drag handling.