diff --git a/macosx/Controller.m b/macosx/Controller.m
index 2ca0d05fe..091a43377 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2961,13 +2961,9 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     if (![fDefaults boolForKey: @"AutoImport"] || ![fDefaults stringForKey: @"AutoImportDirectory"])
         return;
     
-    if (fAutoImportTimer)
-    {
-        if ([fAutoImportTimer isValid])
-            [fAutoImportTimer invalidate];
-        [fAutoImportTimer release];
-        fAutoImportTimer = nil;
-    }
+    if ([fAutoImportTimer isValid])
+        [fAutoImportTimer invalidate];
+    [fAutoImportTimer release];
     
     //check again in 10 seconds in case torrent file wasn't complete
     fAutoImportTimer = [[NSTimer scheduledTimerWithTimeInterval: 10.0 target: self 
@@ -2978,13 +2974,11 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) changeAutoImport
 {
-    if (fAutoImportTimer)
-    {
-        if ([fAutoImportTimer isValid])
-            [fAutoImportTimer invalidate];
-        [fAutoImportTimer release];
-        fAutoImportTimer = nil;
-    }
+    if ([fAutoImportTimer isValid])
+        [fAutoImportTimer invalidate];
+    [fAutoImportTimer release];
+    fAutoImportTimer = nil;
+    
     [fAutoImportedNames release];
     fAutoImportedNames = nil;
     
diff --git a/macosx/FileOutlineController.h b/macosx/FileOutlineController.h
index 2038f20ec..4478ce1a5 100644
--- a/macosx/FileOutlineController.h
+++ b/macosx/FileOutlineController.h
@@ -53,6 +53,6 @@
 
 - (void) revealFile: (id) sender;
 
-- (IBAction) renameSelected: (id) sender;
+- (void) renameSelected: (id) sender;
 
 @end
diff --git a/macosx/FileOutlineController.m b/macosx/FileOutlineController.m
index bf026932f..b88c6b1ac 100644
--- a/macosx/FileOutlineController.m
+++ b/macosx/FileOutlineController.m
@@ -432,7 +432,7 @@ typedef enum
         [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs: paths];
 }
 
-- (IBAction) renameSelected: (id) sender
+- (void) renameSelected: (id) sender
 {
     NSIndexSet * indexes = [fOutline selectedRowIndexes];
     NSAssert([indexes count] == 1, @"1 file needs to be selected to rename, but %ld are selected", [indexes count]);
diff --git a/macosx/FileRenameSheetController.m b/macosx/FileRenameSheetController.m
index bd9989bcd..15865d905 100644
--- a/macosx/FileRenameSheetController.m
+++ b/macosx/FileRenameSheetController.m
@@ -82,7 +82,7 @@ typedef void (^CompletionBlock)(BOOL);
 {
     [super windowDidLoad];
     
-    NSString * name = self.node ? [self.node name] : [self.torrent name];
+    NSString * name = [self.node name] ?: [self.torrent name];
     NSString * label = [NSString stringWithFormat: NSLocalizedString(@"Rename the file \"%@\":", "rename sheet label"), name];
     [self.labelField setStringValue: label];