Some fixes for the drag'n'drop thing