diff --git a/macosx/Makefile.am b/macosx/Makefile.am
index e9cb94463..52a0bb361 100644
--- a/macosx/Makefile.am
+++ b/macosx/Makefile.am
@@ -112,6 +112,8 @@ EXTRA_DIST = \
     MessageWindowController.m \
     NSApplicationAdditions.h \
     NSApplicationAdditions.m \
+    NSMutableArrayAdditions.h \
+    NSMutableArrayAdditions.m \
     NSStringAdditions.h \
     NSStringAdditions.m \
     PeerProgressIndicatorCell.h \
diff --git a/macosx/NSMutableArrayAdditions.h b/macosx/NSMutableArrayAdditions.h
new file mode 100644
index 000000000..b689de5ee
--- /dev/null
+++ b/macosx/NSMutableArrayAdditions.h
@@ -0,0 +1,29 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2011 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
+
+@interface NSMutableArray (NSMutableArrayAdditions)
+
+- (void) moveObjectAtIndex: (NSUInteger) fromIndex toIndex: (NSUInteger) toIndex;
+
+@end
diff --git a/macosx/TrackerTableView.m b/macosx/TrackerTableView.m
index 4e167078b..7130a842f 100644
--- a/macosx/TrackerTableView.m
+++ b/macosx/TrackerTableView.m
@@ -191,7 +191,7 @@
     
     NSAssert([[NSColor controlAlternatingRowBackgroundColors] count] >= 2, @"There should be 2 alternating row colors");
     
-    [[[NSColor controlAlternatingRowBackgroundColors] objectAtIndex: 1] set];
+    [(NSColor *)[[NSColor controlAlternatingRowBackgroundColors] objectAtIndex: 1] set];
     NSRectFillList(gridRects, rectNum);
     
     [super highlightSelectionInClipRect: clipRect];