fix some drag/drop issues