diff --git a/macosx/Controller.m b/macosx/Controller.m
index 9b60ff741..e9d4decc7 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1583,9 +1583,10 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
     if (![[fDefaults stringForKey: @"DownloadChoice"] isEqualToString: @"Ask"])
     {
         enumerator = [newNames objectEnumerator];
+        int count;
         while ((file = [enumerator nextObject]))
         {
-            int count = [fTorrents count];
+            count = [fTorrents count];
             [self openFiles: [NSArray arrayWithObject: file]];
             
             //check if torrent was opened
@@ -1600,9 +1601,9 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
     
     //create temporary torrents to check if an import fails because of an error
     enumerator = [newNames objectEnumerator];
+    int error;
     while ((file = [enumerator nextObject]))
     {
-        int error;
         tr_torrent_t * tempTor = tr_torrentInit(fLib, [file UTF8String], 0, & error);
         
         if (tempTor)
diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib
index d8b96a923..d5237855b 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 2f24905d1..9ff9b88bd 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -505,12 +505,14 @@
         
         if ([ident isEqualToString: @"Connected"])
             return [[peer objectForKey: @"Connected"] boolValue] ? fDotGreen : fDotRed;
+        else if ([ident isEqualToString: @"Client"])
+            return [peer objectForKey: @"Client"];
+        else if  ([ident isEqualToString: @"Progress"])
+            return [peer objectForKey: @"Progress"];
         else if ([ident isEqualToString: @"UL To"])
             return [[peer objectForKey: @"UL To"] boolValue] ? fCheckImage : nil;
         else if ([ident isEqualToString: @"DL From"])
             return [[peer objectForKey: @"DL From"] boolValue] ? fCheckImage : nil;
-        else if ([ident isEqualToString: @"Client"])
-            return [peer objectForKey: @"Client"];
         else
             return [peer objectForKey: @"IP"];
     }
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 834b42938..2a341424b 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -412,12 +412,11 @@
 
 - (void) setAutoImport: (id) sender
 {
+    NSString * path = [[fDefaults stringForKey: @"AutoImportDirectory"] stringByExpandingTildeInPath];
     if ([fDefaults boolForKey: @"AutoImport"])
-        [[UKKQueue sharedFileWatcher] addPath:
-            [[fDefaults stringForKey: @"AutoImportDirectory"] stringByExpandingTildeInPath]];
+        [[UKKQueue sharedFileWatcher] addPath: path];
     else
-        [[UKKQueue sharedFileWatcher] removePathFromQueue:
-            [[fDefaults stringForKey: @"AutoImportDirectory"] stringByExpandingTildeInPath]];
+        [[UKKQueue sharedFileWatcher] removePathFromQueue: path];
     
     [[NSNotificationCenter defaultCenter] postNotificationName: @"AutoImportSettingChange" object: self];
 }
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index a984f9d94..f08cce4b2 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -700,6 +700,7 @@ static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
             [NSNumber numberWithBool: peer.isIncoming], @"Incoming",
             [NSString stringWithCString: (char *) peer.addr encoding: NSUTF8StringEncoding], @"IP",
             [NSString stringWithCString: (char *) peer.client encoding: NSUTF8StringEncoding], @"Client",
+            [NSNumber numberWithFloat: peer.progress], @"Progress",
             [NSNumber numberWithBool: peer.isDownloading], @"UL To",
             [NSNumber numberWithBool: peer.isUploading], @"DL From", nil]];
     }