diff --git a/macosx/Controller.m b/macosx/Controller.m
index 394f396da..75a17dc82 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2476,7 +2476,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
 
 - (id) outlineView: (NSOutlineView *) outlineView objectValueForTableColumn: (NSTableColumn *) tableColumn byItem: (id) item
 {
-    if (![item isKindOfClass: [Torrent class]])
+    if (tableColumn)
     {
         NSString * ident = [tableColumn identifier];
         if ([ident isEqualToString: @"Group"])
@@ -2488,10 +2488,8 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
         else if ([ident isEqualToString: @"Color"])
         {
             int group = [[item objectForKey: @"Group"] intValue];
-            if (group == -1)
-                return [NSImage imageNamed: NSImageNameStopProgressTemplate];
-            else
-                return [[GroupsWindowController groups] imageForIndex: group isSmall: YES];
+            return group != -1 ? [[GroupsWindowController groups] imageForIndex: group isSmall: YES]
+                                : [NSImage imageNamed: NSImageNameStopProgressTemplate];
         }
         else if ([ident isEqualToString: @"UL Image"])
             return [NSImage imageNamed: @"UpArrowGroupTemplate.png"];
diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m
index fd041c293..70f473a3d 100644
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -45,7 +45,7 @@
 #define PADDING_HORIZONTAL 3.0
 #define PADDING_BETWEEN_IMAGE_AND_TITLE 5.0
 #define PADDING_BETWEEN_IMAGE_AND_BAR 7.0
-#define PADDING_ABOVE_TITLE 2.0
+#define PADDING_ABOVE_TITLE 4.0
 #define PADDING_ABOVE_MIN_STATUS 4.0
 #define PADDING_BETWEEN_TITLE_AND_MIN_STATUS 2.0
 #define PADDING_BETWEEN_TITLE_AND_PROGRESS 1.0