Fix some issue with the Drag and Drop