Fix: drag and drop general fixes