More fixes for drag/drop behavior