drag and drop bugfixes