Minor changes to drag and drop functionality