diff --git a/macosx/FilterButton.m b/macosx/FilterButton.m
index 3d9070640..04d8fed87 100644
--- a/macosx/FilterButton.m
+++ b/macosx/FilterButton.m
@@ -30,7 +30,7 @@
 {
     if ((self = [super initWithCoder: coder]))
     {
-        fCount = NSNotFound;
+        fCount = NSUIntegerMax;
     }
     return self;
 }
diff --git a/macosx/ProgressGradients.m b/macosx/ProgressGradients.m
index d3001f86d..9be63444a 100644
--- a/macosx/ProgressGradients.m
+++ b/macosx/ProgressGradients.m
@@ -45,7 +45,7 @@ NSGradient * fProgressWhiteGradient = nil;
 + (NSGradient *) progressWhiteGradient
 {
     if (!fProgressWhiteGradient)
-        fProgressWhiteGradient = [[[self class] progressGradientForRed: 0.95f green: 0.95f blue: 0.95f] retain];
+        fProgressWhiteGradient = [[[self class] progressGradientForRed: 0.95 green: 0.95  blue: 0.95] retain];
     return fProgressWhiteGradient;
 }
 
@@ -53,7 +53,7 @@ NSGradient * fProgressGrayGradient = nil;
 + (NSGradient *) progressGrayGradient
 {
     if (!fProgressGrayGradient)
-        fProgressGrayGradient = [[[self class] progressGradientForRed: 0.7f green: 0.7f blue: 0.7f] retain];
+        fProgressGrayGradient = [[[self class] progressGradientForRed: 0.7 green: 0.7  blue: 0.7] retain];
     return fProgressGrayGradient;
 }
 
@@ -61,7 +61,7 @@ NSGradient * fProgressLightGrayGradient = nil;
 + (NSGradient *) progressLightGrayGradient
 {
     if (!fProgressLightGrayGradient)
-        fProgressLightGrayGradient = [[[self class] progressGradientForRed: 0.87f green: 0.87f blue: 0.87f] retain];
+        fProgressLightGrayGradient = [[[self class] progressGradientForRed: 0.87 green: 0.87  blue: 0.87] retain];
     return fProgressLightGrayGradient;
 }
 
@@ -69,7 +69,7 @@ NSGradient * fProgressBlueGradient = nil;
 + (NSGradient *) progressBlueGradient
 {
     if (!fProgressBlueGradient)
-        fProgressBlueGradient = [[[self class] progressGradientForRed: 0.35f green: 0.67f blue: 0.98f] retain];
+        fProgressBlueGradient = [[[self class] progressGradientForRed: 0.35 green: 0.67  blue: 0.98] retain];
     return fProgressBlueGradient;
 }
 
@@ -77,7 +77,7 @@ NSGradient * fProgressDarkBlueGradient = nil;
 + (NSGradient *) progressDarkBlueGradient
 {
     if (!fProgressDarkBlueGradient)
-        fProgressDarkBlueGradient = [[[self class] progressGradientForRed: 0.616f green: 0.722f blue: 0.776f] retain];
+        fProgressDarkBlueGradient = [[[self class] progressGradientForRed: 0.616 green: 0.722  blue: 0.776] retain];
     return fProgressDarkBlueGradient;
 }
 
@@ -85,7 +85,7 @@ NSGradient * fProgressGreenGradient = nil;
 + (NSGradient *) progressGreenGradient
 {
     if (!fProgressGreenGradient)
-        fProgressGreenGradient = [[[self class] progressGradientForRed: 0.44f green: 0.89f blue: 0.40f] retain];
+        fProgressGreenGradient = [[[self class] progressGradientForRed: 0.44 green: 0.89  blue: 0.40] retain];
     return fProgressGreenGradient;
 }
 
@@ -93,7 +93,7 @@ NSGradient * fProgressLightGreenGradient = nil;
 + (NSGradient *) progressLightGreenGradient
 {
     if (!fProgressLightGreenGradient)
-        fProgressLightGreenGradient = [[[self class] progressGradientForRed: 0.62f green: 0.99f blue: 0.58f] retain];
+        fProgressLightGreenGradient = [[[self class] progressGradientForRed: 0.62 green: 0.99  blue: 0.58] retain];
     return fProgressLightGreenGradient;
 }
 
@@ -101,7 +101,7 @@ NSGradient * fProgressDarkGreenGradient = nil;
 + (NSGradient *) progressDarkGreenGradient
 {
     if (!fProgressDarkGreenGradient)
-        fProgressDarkGreenGradient = [[[self class] progressGradientForRed: 0.627f green: 0.714f blue: 0.639f] retain];
+        fProgressDarkGreenGradient = [[[self class] progressGradientForRed: 0.627 green: 0.714  blue: 0.639] retain];
     return fProgressDarkGreenGradient;
 }
 
@@ -109,7 +109,7 @@ NSGradient * fProgressRedGradient = nil;
 + (NSGradient *) progressRedGradient
 {
     if (!fProgressRedGradient)
-        fProgressRedGradient = [[[self class] progressGradientForRed: 0.902f green: 0.439f blue: 0.451f] retain];
+        fProgressRedGradient = [[[self class] progressGradientForRed: 0.902 green: 0.439  blue: 0.451] retain];
     return fProgressRedGradient;
 }
 
@@ -117,7 +117,7 @@ NSGradient * fProgressYellowGradient = nil;
 + (NSGradient *) progressYellowGradient
 {
     if (!fProgressYellowGradient)
-        fProgressYellowGradient = [[[self class] progressGradientForRed: 0.933f green: 0.890f blue: 0.243f] retain];
+        fProgressYellowGradient = [[[self class] progressGradientForRed: 0.933 green: 0.890  blue: 0.243] retain];
     return fProgressYellowGradient;
 }
 
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index d35dc18b3..f5a787fe9 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -962,8 +962,8 @@ int trashDataFile(const char * filename)
                 break;
 
             case TR_STATUS_CHECK:
-                string = [NSString localizedStringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
-                                        "Torrent -> status string"), 100.0 * [self checkingProgress]];
+                string = [NSString localizedStringWithFormat: @"%@ (%.2f%%)",
+                            NSLocalizedString(@"Checking existing data", "Torrent -> status string"), 100.0 * [self checkingProgress]];
                 break;
 
             case TR_STATUS_DOWNLOAD:
diff --git a/macosx/en.lproj/Localizable.strings b/macosx/en.lproj/Localizable.strings
index fa13b9777..e0f5ba327 100644
Binary files a/macosx/en.lproj/Localizable.strings and b/macosx/en.lproj/Localizable.strings differ