diff --git a/macosx/Badger.m b/macosx/Badger.m
index 2395c95f3..d8e77da54 100644
--- a/macosx/Badger.m
+++ b/macosx/Badger.m
@@ -99,11 +99,10 @@
     }
 
     //set upload and download rate badges
-    NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
-    NSString * uploadRateString = uploadRate >= 0.1 && [defaults boolForKey: @"BadgeUploadRate"]
-                                    ? [NSString stringForSpeedAbbrev: uploadRate] : nil,
-            * downloadRateString = downloadRate >= 0.1 && [defaults boolForKey: @"BadgeDownloadRate"]
-                                    ? [NSString stringForSpeedAbbrev: downloadRate] : nil;
+    NSString * uploadRateString = uploadRate >= 0.1 && [[NSUserDefaults standardUserDefaults]
+                    boolForKey: @"BadgeUploadRate"] ? [NSString stringForSpeedAbbrev: uploadRate] : nil,
+            * downloadRateString = downloadRate >= 0.1 && [[NSUserDefaults standardUserDefaults]
+                    boolForKey: @"BadgeDownloadRate"] ? [NSString stringForSpeedAbbrev: downloadRate] : nil;
     
     if (uploadRateString || downloadRateString)
     {
diff --git a/macosx/Controller.m b/macosx/Controller.m
index e852e3229..5762868d0 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -525,7 +525,8 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
 {
     NSString * path = [[fPendingTorrentDownloads objectForKey: [[download request] URL]] objectForKey: @"Path"];
     
-    [self openFiles: [NSArray arrayWithObject: path] ignoreDownloadFolder: NO forceDeleteTorrent: YES];
+    [self openFiles: [NSArray arrayWithObject: path] ignoreDownloadFolder:
+        ![[fDefaults stringForKey: @"DownloadChoice"] isEqualToString: @"Constant"] forceDeleteTorrent: YES];
     
     [fPendingTorrentDownloads removeObjectForKey: [[download request] URL]];
     [download release];
@@ -1774,13 +1775,15 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
         [self application: NSApp openFiles: filesToOpen];
         [filesToOpen release];
     }
-    else if ([[pasteboard types] containsObject: NSURLPboardType])
+    
+    if ([[pasteboard types] containsObject: NSURLPboardType])
     {
         NSURL * url;
-        if ((url = [NSURL URLFromPasteboard:pasteboard]))
+        if ((url = [NSURL URLFromPasteboard: pasteboard]))
             [self openURL: url];
     }
-    else if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
+    
+    if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
     {
         //remember selected rows if needed
         NSArray * selectedTorrents = nil;
@@ -1832,7 +1835,6 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
             [indexSet release];
         }
     }
-    else;
     
     return YES;
 }