diff --git a/macosx/FileOutlineView.m b/macosx/FileOutlineView.m
index 75bd29d4c..a2e8c4877 100644
--- a/macosx/FileOutlineView.m
+++ b/macosx/FileOutlineView.m
@@ -176,7 +176,7 @@
     }
 }
 
-- (void) drawRow: (int) row clipRect: (NSRect) clipRect
+- (void) drawRow: (NSInteger) row clipRect: (NSRect) clipRect
 {
     if (![self isRowSelected: row])
     {
diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index df6bb6acd..2c3b58b61 100644
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -228,7 +228,7 @@
 }
 
 #warning don't cut off end
-- (float) tableView: (NSTableView *) tableView heightOfRow: (NSInteger) row
+- (CGFloat) tableView: (NSTableView *) tableView heightOfRow: (NSInteger) row
 {
     NSTableColumn * column = [tableView tableColumnWithIdentifier: @"Message"];
     
diff --git a/macosx/PiecesView.m b/macosx/PiecesView.m
index 29a75cb44..aa8b8af43 100644
--- a/macosx/PiecesView.m
+++ b/macosx/PiecesView.m
@@ -116,7 +116,7 @@
     }
 
     int8_t * pieces = NULL;
-    CGFloat * piecesPercent = NULL;
+    float * piecesPercent = NULL;
     
     BOOL showAvailablity = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"];
     if (showAvailablity)
@@ -126,7 +126,7 @@
     }
     else
     {   
-        piecesPercent = (CGFloat *)tr_malloc(fNumPieces * sizeof(CGFloat));
+        piecesPercent = (float *)tr_malloc(fNumPieces * sizeof(float));
         [fTorrent getAmountFinished: piecesPercent size: fNumPieces];
     }
     
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 232e47ae9..50b164797 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -999,12 +999,12 @@ void completenessChangeCallback(tr_torrent * torrent, tr_completeness status, vo
 
 - (NSArray *) peers
 {
-    NSInteger totalPeers;
+    int totalPeers;
     tr_peer_stat * peers = tr_torrentPeers(fHandle, &totalPeers);
     
     NSMutableArray * peerDicts = [NSMutableArray arrayWithCapacity: totalPeers];
     
-    for (NSInteger i = 0; i < totalPeers; i++)
+    for (int i = 0; i < totalPeers; i++)
     {
         tr_peer_stat * peer = &peers[i];
         NSMutableDictionary * dict = [NSMutableDictionary dictionaryWithCapacity: 9];
diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m
index 58baf8f20..967d89bc3 100644
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -674,7 +674,7 @@
     Torrent * torrent = [self representedObject];
     
     NSInteger pieceCount = MIN([torrent pieceCount], MAX_PIECES);
-    CGFloat * piecesPercent = malloc(pieceCount * sizeof(CGFloat));
+    float * piecesPercent = malloc(pieceCount * sizeof(float));
     [torrent getAmountFinished: piecesPercent size: pieceCount];
     
     NSBitmapImageRep * bitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes: nil