diff --git a/Bean OSX Static Library/Bean OSX Library.xcodeproj/project.pbxproj b/Bean OSX Static Library/Bean OSX Library.xcodeproj/project.pbxproj
index b885b5b..115223c 100644
--- a/Bean OSX Static Library/Bean OSX Library.xcodeproj/project.pbxproj	
+++ b/Bean OSX Static Library/Bean OSX Library.xcodeproj/project.pbxproj	
@@ -684,7 +684,7 @@
 		52D34E1C18A9B455002F0C59 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Punch Through Design";
 			};
 			buildConfigurationList = 52D34E1F18A9B455002F0C59 /* Build configuration list for PBXProject "Bean OSX Library" */;
@@ -933,14 +933,19 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -971,14 +976,19 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1073,7 +1083,7 @@
 					"$(inherited)",
 				);
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1089,7 +1099,7 @@
 				DSTROOT = /tmp/Bean_iOS_Library.dst;
 				GCC_PREFIX_HEADER = "Bean OSX Library/Bean iOS Library-Prefix.pch";
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
diff --git a/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Bean OS X Library.xcscheme b/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Bean OS X Library.xcscheme
index 1bb3d9f..fe44c7d 100644
--- a/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Bean OS X Library.xcscheme	
+++ b/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Bean OS X Library.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Bean iOS Library.xcscheme b/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Bean iOS Library.xcscheme
index 5ad4678..e83f43f 100644
--- a/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Bean iOS Library.xcscheme	
+++ b/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Bean iOS Library.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Generate Appledoc.xcscheme b/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Generate Appledoc.xcscheme
index 34cfffc..8e55bb6 100644
--- a/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Generate Appledoc.xcscheme	
+++ b/Bean OSX Static Library/Bean OSX Library.xcodeproj/xcshareddata/xcschemes/Generate Appledoc.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/source/Categories/CBPeripheral+RSSI_Universal.h b/source/Categories/CBPeripheral+RSSI_Universal.h
index 9150974..3d90f8e 100644
--- a/source/Categories/CBPeripheral+RSSI_Universal.h
+++ b/source/Categories/CBPeripheral+RSSI_Universal.h
@@ -6,11 +6,7 @@
 //  Copyright (c) 2015 Punch Through Design. All rights reserved.
 //
 
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
 #import <CoreBluetooth/CoreBluetooth.h>
-#else
-#import <IOBluetooth/IOBluetooth.h>
-#endif
 
 
 @interface CBPeripheral (RSSI_Universal)
diff --git a/source/Categories/CBPeripheral+UniqueId.h b/source/Categories/CBPeripheral+UniqueId.h
index 8513acd..d3de89d 100644
--- a/source/Categories/CBPeripheral+UniqueId.h
+++ b/source/Categories/CBPeripheral+UniqueId.h
@@ -6,11 +6,7 @@
 ////  Copyright (c) 2014 Punch Through Design. All rights reserved.
 ////
 //
-#if TARGET_OS_IPHONE
 #import <CoreBluetooth/CoreBluetooth.h>
-#else
-#import <IOBluetooth/IOBluetooth.h>
-#endif
 
 @interface CBPeripheral (UniqueId)
 
diff --git a/source/Profiles/BleProfile.h b/source/Profiles/BleProfile.h
index 98dd829..1576fa7 100644
--- a/source/Profiles/BleProfile.h
+++ b/source/Profiles/BleProfile.h
@@ -7,14 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
 #import <CoreBluetooth/CoreBluetooth.h>
-#else
-#import <IOBluetooth/IOBluetooth.h>
-#endif
-
-
 
 
 // This is an abstract class and should only be used when subclassed.