diff --git a/Boxer/BXBinCueImageImport.m b/Boxer/BXBinCueImageImport.m
index 8ee47e7c..3b9fa0a1 100644
--- a/Boxer/BXBinCueImageImport.m
+++ b/Boxer/BXBinCueImageImport.m
@@ -24,9 +24,9 @@ typedef NS_ENUM(NSInteger, BXDADiskOperationStatus)
 	BXDADiskOperationSucceeded = 1
 };
 
-BOOL _mountSynchronously(DASessionRef, DADiskRef disk, CFURLRef path, DADiskUnmountOptions options);
-BOOL _unmountSynchronously(DASessionRef session, DADiskRef disk, DADiskMountOptions options);
-void _mountCallback(DADiskRef disk, DADissenterRef dissenter, void *status);
+static BOOL _mountSynchronously(DASessionRef, DADiskRef disk, CFURLRef path, DADiskUnmountOptions options);
+static BOOL _unmountSynchronously(DASessionRef session, DADiskRef disk, DADiskMountOptions options);
+static void _mountCallback(DADiskRef disk, DADissenterRef dissenter, void *status);
 
 #pragma mark -
 #pragma mark Implementation
diff --git a/Boxer/DOS window/BXStatusBarController.m b/Boxer/DOS window/BXStatusBarController.m
index 8f3e3bb9..99499011 100644
--- a/Boxer/DOS window/BXStatusBarController.m	
+++ b/Boxer/DOS window/BXStatusBarController.m	
@@ -87,12 +87,10 @@ - (void) observeValueForKeyPath: (NSString *)keyPath
 {
 	[self _syncSegmentedButtonStates];
 	
-	NSArray *mouseLockModifiers = [NSArray arrayWithObjects:
-                                            @"DOSViewShown",
+	NSArray *mouseLockModifiers = @[@"DOSViewShown",
                                             @"inputController.mouseActive",
                                             @"inputController.mouseLocked",
-                                            @"inputController.trackMouseWhileUnlocked",
-                                            nil];
+                                    @"inputController.trackMouseWhileUnlocked"];
 	
 	if ([mouseLockModifiers containsObject: keyPath])
 	{
@@ -160,17 +158,19 @@ - (void) _syncSegmentedButtonStates
 	[self.statusBarControls setEnabled:	self.controller.inputController.mouseActive     forSegment: BXStatusBarMouseLockSegment];
 	
 	NSString *panelImageName;
-	if ([self.statusBarControls isSelectedForSegment: BXStatusBarProgramPanelSegment])
+	if ([self.statusBarControls isSelectedForSegment: BXStatusBarProgramPanelSegment]) {
         panelImageName = @"PanelCollapseTemplate";
-	else
+	} else {
         panelImageName = @"PanelExpandTemplate";
+    }
 	[self.statusBarControls setImage: [NSImage imageNamed: panelImageName] forSegment: BXStatusBarProgramPanelSegment];
 	
 	NSString *lockImageName;
-	if ([self.statusBarControls isSelectedForSegment: BXStatusBarMouseLockSegment])
-        lockImageName = @"NSLockLockedTemplate";
-	else
-        lockImageName = @"NSLockUnlockedTemplate";
+	if ([self.statusBarControls isSelectedForSegment: BXStatusBarMouseLockSegment]) {
+        lockImageName = NSImageNameLockLockedTemplate;
+    } else {
+        lockImageName = NSImageNameLockUnlockedTemplate;
+    }
 	[self.statusBarControls setImage: [NSImage imageNamed: lockImageName] forSegment: BXStatusBarMouseLockSegment];
 }