Merge "Cleaning up some drop-target issues."