diff --git a/clientgui/mac/MacAccessiblity.mm b/clientgui/mac/MacAccessiblity.mm
index 05a0fb23f4..545ee1641a 100644
--- a/clientgui/mac/MacAccessiblity.mm
+++ b/clientgui/mac/MacAccessiblity.mm
@@ -329,7 +329,7 @@ static void wxRectToNSRect(wxRect &wxr, NSRect &nsr) {
         return [NSNumber numberWithBool:YES];
 
     } else if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
-        return NO;
+        return [NSNumber numberWithBool:NO];
 
     } else if ([attribute isEqualToString:NSAccessibilityRoleAttribute]) {
         return NSAccessibilityStaticTextRole;
@@ -626,7 +626,7 @@ static void wxRectToNSRect(wxRect &wxr, NSRect &nsr) {
         return [NSNumber numberWithBool:YES];
 
     } else if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
-        return NO;
+        return [NSNumber numberWithBool:NO];
 
     } else if ([attribute isEqualToString:NSAccessibilityParentAttribute]) {
         return NSAccessibilityUnignoredAncestor(parent);
@@ -926,7 +926,7 @@ static void wxRectToNSRect(wxRect &wxr, NSRect &nsr) {
         return NSAccessibilityRoleDescription(NSAccessibilityListRole, nil);
 
     } else if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
-        return NO;
+        return [NSNumber numberWithBool:NO];
         
     } else if ([attribute isEqualToString:NSAccessibilityParentAttribute]) {
         return NSAccessibilityUnignoredAncestor(parent);
@@ -1248,7 +1248,7 @@ static BOOL AccessibilityEnabled = false;
         return NSAccessibilityRoleDescription(NSAccessibilityGroupRole, nil);
 
     } else if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
-        return NO;
+        return [NSNumber numberWithBool:NO];
     
     } else if ([attribute isEqualToString:NSAccessibilityParentAttribute]) {
         return NSAccessibilityUnignoredAncestor(parent);
@@ -1540,7 +1540,7 @@ void CBOINCListCtrl::RemoveMacAccessibilitySupport() {
         return [NSNumber numberWithBool:YES];
 
     } else if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
-        return NO;
+        return [NSNumber numberWithBool:NO];
 
     } else if ([attribute isEqualToString:NSAccessibilityNumberOfCharactersAttribute]) {
         NSString *s = [self getValue];
diff --git a/clientscr/mac_saver_module.cpp b/clientscr/mac_saver_module.cpp
index 302dc93bf4..10187373ba 100644
--- a/clientscr/mac_saver_module.cpp
+++ b/clientscr/mac_saver_module.cpp
@@ -317,7 +317,7 @@ CScreensaver::CScreensaver() {
     m_iGraphicsStartingMsgCounter = 0;
     saverState = SaverState_Idle;
     m_wasAlreadyRunning = false;
-    m_CoreClientPID = nil;
+    m_CoreClientPID = 0;
     setSSMessageText(0);
     m_CurrentBannerMessage = 0;
     m_bQuitDataManagementProc = false;