diff --git a/macosx/Controller.m b/macosx/Controller.m
index 7305fb041..7b182edb1 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2275,7 +2275,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         icon = [[GroupsController groups] imageForIndex: groupIndex];
         NSString * groupName = groupIndex != -1 ? [[GroupsController groups] nameForIndex: groupIndex]
                                                 : NSLocalizedString(@"None", "Groups -> Button");
-        toolTip = [NSString stringWithFormat: @"%@: %@", NSLocalizedString(@"Group", "Groups -> Button"), groupName];
+        toolTip = [NSLocalizedString(@"Group", "Groups -> Button") stringByAppendingFormat: @": %@", groupName];
     }
     
     //tiger doesn't have built-in image scaling in buttons
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index a22e4dfbb..92824216b 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -842,7 +842,6 @@ typedef enum
 {
     if ([notification object] == fTrackerTable)
     {
-        #warning disable when all selected
         int numSelected = [fTrackerTable numberOfSelectedRows];
         [fTrackerAddRemoveControl setEnabled: numSelected > 0 forSegment: TRACKER_REMOVE_TAG];
     }
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 1b781d379..79dd92921 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -671,13 +671,12 @@
     
     NSString * string = [components componentsJoinedByString: @","];
     
-    char ** error = (char **)tr_malloc(sizeof(char **));
-    if (tr_sessionSetRPCACL(fHandle, [string UTF8String], error))
+    char * error = NULL;
+    if (tr_sessionSetRPCACL(fHandle, [string UTF8String], &error))
     {
-        NSLog([NSString stringWithUTF8String: *error]);
-        tr_free(*error);
+        NSLog([NSString stringWithUTF8String: error]);
+        tr_free(error);
     }
-    tr_free(error);
 }
 
 - (void) addRemoveRPCIP: (id) sender
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 24f970133..563af5905 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -52,7 +52,7 @@
 
 - (NSString *) etaString: (int) eta;
 
-- (BOOL) updateAllTrackers: (NSMutableArray *) trackers;
+- (void) updateAllTrackers: (NSMutableArray *) trackers;
 
 - (void) trashFile: (NSString *) path;
 
@@ -813,18 +813,21 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     if (!tr_httpIsValidURL([tracker UTF8String]))
         return NO;
     
-    fAddedTrackers = YES;
+    [self updateAllTrackers: trackers];
     
-    return [self updateAllTrackers: trackers];
+    fAddedTrackers = YES;
+    return YES;
 }
 
 - (BOOL) updateAllTrackersForRemove: (NSMutableArray *) trackers
 {
-    //check if any user-added groups
+    //check if no user-added groups
     if ([[trackers objectAtIndex: 0] intValue] != 0)
         fAddedTrackers = NO;
     
-    return [self updateAllTrackers: trackers];
+    [self updateAllTrackers: trackers];
+    
+    return YES;
 }
 
 - (BOOL) hasAddedTrackers
@@ -1882,7 +1885,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     }
 }
 
-- (BOOL) updateAllTrackers: (NSMutableArray *) trackers
+- (void) updateAllTrackers: (NSMutableArray *) trackers
 {
     //get count
     int count = 0;
@@ -1911,8 +1914,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     
     tr_torrentSetAnnounceList(fHandle, trackerStructs, count);
     tr_free(trackerStructs);
-    
-    return YES;
 }
 
 - (void) trashFile: (NSString *) path