diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index e64c0b895..5151920c9 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -568,7 +568,13 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
                     NSDictionary * fileAttributes = onLeopard ? [fileManager attributesOfItemAtPath: path error: NULL]
                                                         : [fileManager fileAttributesAtPath: path traverseLink: NO];
                     if (fileAttributes)
-                        neededSpace -= [[fileAttributes objectForKey: NSFileSize] unsignedLongLongValue];
+                    {
+                        unsigned long long fileSize = [[fileAttributes objectForKey: NSFileSize] unsignedLongLongValue];
+                        if (fileSize < neededSpace)
+                            neededSpace -= fileSize;
+                        else
+                            neededSpace = 0;
+                    }
                 }
             }
             
diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m
index d294a9476..d5a258837 100644
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -497,6 +497,7 @@
         [fErrorImage drawInRect: errorRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
     }
     
+    #warning alter
     //text color
     NSColor * titleColor, * statusColor;
     if ([NSApp isOnLeopardOrBetter] ? [self backgroundStyle] == NSBackgroundStyleDark : [self isHighlighted]