Fixes to drag & drop