drag and drop fixes