diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib
index 766b6ee6a..6e087ecb0 100644
Binary files a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib and b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib differ
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index d26abb0e6..834829d47 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -684,7 +684,7 @@
         else if  ([ident isEqualToString: @"Progress"])
         {
             NSNumber * progress;
-            return (progress = [peer objectForKey: @"Progress"]) ? progress : nil;
+            return (progress = [peer objectForKey: @"Progress"]) ? progress : [NSNumber numberWithFloat: 0];
         }
         else if ([ident isEqualToString: @"UL To"])
         {
diff --git a/macosx/StringAdditions.m b/macosx/StringAdditions.m
index c2b6c1f6f..3fa38b1e9 100644
--- a/macosx/StringAdditions.m
+++ b/macosx/StringAdditions.m
@@ -135,4 +135,19 @@
     return NSOrderedSame;
 }
 
+- (NSComparisonResult) clientCompare: (NSString *) string
+{
+    BOOL selfBlank = [self isEqualToString: @""],
+        newBlank = [string isEqualToString: @""];
+    
+    if (selfBlank && newBlank)
+        return NSOrderedSame;
+    else if (selfBlank)
+        return NSOrderedDescending;
+    else if (newBlank)
+        return NSOrderedAscending;
+    else
+        return [self caseInsensitiveCompare: string];
+}
+
 @end
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 937f604a8..2dbb6da3b 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1076,7 +1076,7 @@ static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
             [dic setObject: [NSString stringWithCString: (char *) peer->client encoding: NSUTF8StringEncoding] forKey: @"Client"];
         }
         else
-            [dic setObject: NSLocalizedString(@"not connected", "Peer -> client") forKey: @"Client"];
+            [dic setObject: @"" forKey: @"Client"];
         
         [peerDics addObject: dic];
     }