Merge "Fixing some drag and drop issues."