misc drag and drop fixes