diff --git a/README.md b/README.md
index 1bb3b77..84f7aad 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ https://code.google.com/p/os-x-voodoo-ps2-controller/downloads/list
 
 ### Build Environment
 
-My build environment is currently Xcode 4.52, using SDK 10.7, targeting OS X 10.6.
+My build environment is currently Xcode 4.61, using SDK 10.7, targeting OS X 10.6.
 
 No other build environment is supported.
 
diff --git a/VoodooPS2Controller.xcodeproj/project.pbxproj b/VoodooPS2Controller.xcodeproj/project.pbxproj
index 75a9fab..1a0a2ac 100644
--- a/VoodooPS2Controller.xcodeproj/project.pbxproj
+++ b/VoodooPS2Controller.xcodeproj/project.pbxproj
@@ -560,7 +560,7 @@
 		84167808161B55B2002C60E6 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0460;
 				ORGANIZATIONNAME = rehabman;
 			};
 			buildConfigurationList = 8416780B161B55B2002C60E6 /* Build configuration list for PBXProject "VoodooPS2Controller" */;
@@ -794,7 +794,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1.8.0;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEPLOYMENT_POSTPROCESSING = YES;
@@ -829,7 +828,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1.8.0;
 				DEPLOYMENT_POSTPROCESSING = YES;
 				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
@@ -971,7 +969,6 @@
 		84C337A11698B693009B8177 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -980,7 +977,6 @@
 		84C337A21698B693009B8177 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -989,7 +985,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
-				GCC_ENABLE_OBJC_GC = supported;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "VoodooPS2synapticsPane/VoodooPS2synapticsPane-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
@@ -1004,7 +999,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
-				GCC_ENABLE_OBJC_GC = supported;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "VoodooPS2synapticsPane/VoodooPS2synapticsPane-Prefix.pch";
 				INFOPLIST_FILE = "VoodooPS2synapticsPane/VoodooPS2synapticsPane-Info.plist";
@@ -1017,7 +1011,6 @@
 		84F42503161B5A4900777765 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1026,7 +1019,6 @@
 		84F42504161B5A4900777765 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/All Kext.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/All Kext.xcscheme
index 42293e9..9b5aac0 100644
--- a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/All Kext.xcscheme	
+++ b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/All Kext.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/All.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/All.xcscheme
index 6c7ebfd..d20209d 100644
--- a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/All.xcscheme
+++ b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/All.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Controller.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Controller.xcscheme
index b251809..7d81de0 100644
--- a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Controller.xcscheme
+++ b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Controller.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Daemon.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Daemon.xcscheme
index ecef46e..5ef897e 100644
--- a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Daemon.xcscheme
+++ b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Daemon.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Keyboard.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Keyboard.xcscheme
index 45579f9..6ca9ad8 100644
--- a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Keyboard.xcscheme
+++ b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Keyboard.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Mouse.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Mouse.xcscheme
index 67e1ef1..34ae68c 100644
--- a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Mouse.xcscheme
+++ b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Mouse.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Trackpad.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Trackpad.xcscheme
index db83c7c..71514c9 100644
--- a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Trackpad.xcscheme
+++ b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2Trackpad.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2synapticsPane.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2synapticsPane.xcscheme
index 2bd4fe6..7ec0581 100644
--- a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2synapticsPane.xcscheme
+++ b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/VoodooPS2synapticsPane.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/synapticsconfigload.xcscheme b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/synapticsconfigload.xcscheme
index 3bc7cb0..3f8d33a 100644
--- a/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/synapticsconfigload.xcscheme
+++ b/VoodooPS2Controller.xcodeproj/xcshareddata/xcschemes/synapticsconfigload.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/VoodooPS2Controller/AppleACPIPS2Nub.cpp b/VoodooPS2Controller/AppleACPIPS2Nub.cpp
index f47b524..3b915e2 100644
--- a/VoodooPS2Controller/AppleACPIPS2Nub.cpp
+++ b/VoodooPS2Controller/AppleACPIPS2Nub.cpp
@@ -127,10 +127,6 @@ IOService *AppleACPIPS2Nub::findMouseDevice()
 
 void AppleACPIPS2Nub::mergeInterruptProperties(IOService *pnpProvider, long)
 {
-    /* Make sure we're called from within start() where these i-vars are valid */
-    if(m_interruptControllers == NULL || m_interruptSpecifiers == NULL)
-        return;
-
     /*  Get the interrupt controllers/specifiers arrays from the provider, and make sure they
      *  exist and contain at least one entry.  We assume they contain exactly one entry.
      */
diff --git a/VoodooPS2Controller/VoodooPS2Controller.cpp b/VoodooPS2Controller/VoodooPS2Controller.cpp
index 9f12359..a040898 100644
--- a/VoodooPS2Controller/VoodooPS2Controller.cpp
+++ b/VoodooPS2Controller/VoodooPS2Controller.cpp
@@ -1756,8 +1756,9 @@ void ApplePS2Controller::setPowerStateCallout( thread_call_param_t param0,
                                                thread_call_param_t param1 )
 {
   ApplePS2Controller * me = (ApplePS2Controller *) param0;
+  assert(me);
 
-  if ( me && me->_workLoop )
+  if (me->_workLoop)
   {
     me->_workLoop->runAction( /* Action */ setPowerStateAction,
                               /* target */ me,
@@ -2115,6 +2116,9 @@ OSDictionary* ApplePS2Controller::getConfigurationNode(OSDictionary* list, OSStr
 
 EXPORT OSDictionary* ApplePS2Controller::makeConfigurationNode(OSDictionary* list, OSString* model)
 {
+    if (!list)
+        return NULL;
+    
     OSDictionary* result = 0;
     OSDictionary* defaultNode = _getConfigurationNode(list, kDefault);
     OSDictionary* platformNode = getConfigurationNode(list, model);
diff --git a/VoodooPS2Daemon/main.cpp b/VoodooPS2Daemon/main.cpp
index 76d2d5b..b29b177 100644
--- a/VoodooPS2Daemon/main.cpp
+++ b/VoodooPS2Daemon/main.cpp
@@ -122,10 +122,10 @@ static void DeviceAdded(void *refCon, io_iterator_t iter1)
                 ++g_MouseCount;
                 DEBUG_LOG("mouse count is now: %d\n", g_MouseCount);
             }
-            kr = IOObjectRelease(temp);
+            IOObjectRelease(temp);
         }
-        kr = IOObjectRelease(iter2);
-        kr = IOObjectRelease(service);
+        IOObjectRelease(iter2);
+        IOObjectRelease(service);
     }
     if (oldMouseCount != g_MouseCount)
         SendMouseCount(g_MouseCount);