diff --git a/CocoaSecurity.xcodeproj/project.pbxproj b/CocoaSecurity.xcodeproj/project.pbxproj
index 936f7e4..b5eff21 100644
--- a/CocoaSecurity.xcodeproj/project.pbxproj
+++ b/CocoaSecurity.xcodeproj/project.pbxproj
@@ -201,7 +201,7 @@
 		2113922F16EAD6AF00AFDF87 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0510;
 				TargetAttributes = {
 					215409EB183DD72F00E4C15B = {
 						TestTargetID = 2113923616EAD6AF00AFDF87;
@@ -307,7 +307,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
-				ONLY_ACTIVE_ARCH = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -339,7 +339,6 @@
 		2113925D16EAD6AF00AFDF87 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				DSTROOT = /tmp/CocoaSecurity.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
@@ -354,7 +353,6 @@
 		2113925E16EAD6AF00AFDF87 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				DSTROOT = /tmp/CocoaSecurity.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "";
@@ -369,7 +367,6 @@
 		215409FB183DD72F00E4C15B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -400,7 +397,6 @@
 		215409FC183DD72F00E4C15B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
diff --git a/CocoaSecurity.xcodeproj/xcshareddata/xcschemes/CocoaSecurity.xcscheme b/CocoaSecurity.xcodeproj/xcshareddata/xcschemes/CocoaSecurity.xcscheme
index 1510cba..7912c63 100644
--- a/CocoaSecurity.xcodeproj/xcshareddata/xcschemes/CocoaSecurity.xcscheme
+++ b/CocoaSecurity.xcodeproj/xcshareddata/xcschemes/CocoaSecurity.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/submodules/Base64 b/submodules/Base64
index 613d17c..bff0cc9 160000
--- a/submodules/Base64
+++ b/submodules/Base64
@@ -1 +1 @@
-Subproject commit 613d17caeb02928df50e77cc438439cccf95c4cd
+Subproject commit bff0cc9be811b62bd09cca96cf9177b653c1a9f9
diff --git a/submodules/xctool b/submodules/xctool
index 75c50c0..80e973c 160000
--- a/submodules/xctool
+++ b/submodules/xctool
@@ -1 +1 @@
-Subproject commit 75c50c0309ab9ae18d7a235e217c0178c913de9e
+Subproject commit 80e973c39234eecff9f74b8aea5eec38e1c3c8d4