diff --git a/Source/NSOutlineView.m b/Source/NSOutlineView.m
index 70384d608..2bce56933 100644
--- a/Source/NSOutlineView.m
+++ b/Source/NSOutlineView.m
@@ -2308,12 +2308,17 @@ Also returns the child index relative to this parent. */
                               objectValueForTableColumn:column
                                                  byItem:item];
         
+      draggedItemString = [draggedObject description];
       // Pad the string to match its indentation level:
       int level = [self levelForRow:row];
-      NSString *pad = [@"" stringByPaddingToLength:(level*4)
-                                        withString:@" "
-                                   startingAtIndex:0];
-      draggedItemString = [pad stringByAppendingString:[draggedObject description]];
+      if (level > 0)
+        {
+          NSString *pad = [@"" stringByPaddingToLength:(level*4)
+                                            withString:@" "
+                                       startingAtIndex:0];
+        
+          draggedItemString = [pad stringByAppendingString:draggedItemString];
+        }
     }
   return draggedItemString;
 }
diff --git a/Source/NSTableView.m b/Source/NSTableView.m
index 82fef4669..1c98a1852 100644
--- a/Source/NSTableView.m
+++ b/Source/NSTableView.m
@@ -5552,7 +5552,7 @@ This method is deprecated, use -columnIndexesInRect:. */
   // Build a string of texts, each representing a line from the tableView,
   // separated by "\n":
   NSString *descriptionsList = nil;
-  unsigned int index = [rows firstIndex];
+  NSInteger index = [rows firstIndex];
   while (index != NSNotFound)
   {
     NSString *draggedItemString = [self _objectStringForTableColumn:[cols objectAtIndex:0]