diff --git a/MPOAuth.xcodeproj/project.pbxproj b/MPOAuth.xcodeproj/project.pbxproj
index 5e1f4fa..659826e 100755
--- a/MPOAuth.xcodeproj/project.pbxproj
+++ b/MPOAuth.xcodeproj/project.pbxproj
@@ -886,6 +886,8 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MPOAuth" */;
 			compatibilityVersion = "Xcode 3.1";
 			developmentRegion = English;
@@ -1307,26 +1309,26 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = "";
+				SDKROOT = iphoneos;
 			};
 			name = Debug;
 		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = "";
+				SDKROOT = iphoneos;
 			};
 			name = Release;
 		};
@@ -1612,6 +1614,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1627,7 +1630,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
diff --git a/Source/Framework/MPOAuthCredentialConcreteStore+KeychainAdditionsiPhone.m b/Source/Framework/MPOAuthCredentialConcreteStore+KeychainAdditionsiPhone.m
index f1f4c15..c77fde7 100644
--- a/Source/Framework/MPOAuthCredentialConcreteStore+KeychainAdditionsiPhone.m
+++ b/Source/Framework/MPOAuthCredentialConcreteStore+KeychainAdditionsiPhone.m
@@ -109,4 +109,4 @@ - (void)removeValueFromKeychainUsingName:(NSString *)inName {
 
 @end
 
-#endif TARGET_OS_IPHONE
+#endif // TARGET_OS_IPHONE
diff --git a/Source/Framework/MPOAuthCredentialConcreteStore.m b/Source/Framework/MPOAuthCredentialConcreteStore.m
index d5dadd1..7e6bdcf 100644
--- a/Source/Framework/MPOAuthCredentialConcreteStore.m
+++ b/Source/Framework/MPOAuthCredentialConcreteStore.m
@@ -188,7 +188,7 @@ - (NSString *)signingKey {
 	NSString *consumerSecret = [[self consumerSecret] stringByAddingURIPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 	NSString *tokenSecret = [[self tokenSecret] stringByAddingURIPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 	
-	return [NSString stringWithFormat:@"%@%&%@", consumerSecret, tokenSecret];
+	return [NSString stringWithFormat:@"%@&%@", consumerSecret, tokenSecret];
 }
 
 #pragma mark -
diff --git a/Source/Framework/MPOAuthURLRequest.m b/Source/Framework/MPOAuthURLRequest.m
index 93e3df9..71aba0d 100644
--- a/Source/Framework/MPOAuthURLRequest.m
+++ b/Source/Framework/MPOAuthURLRequest.m
@@ -110,7 +110,7 @@ - (NSURLRequest  *)urlRequestSignedWithSecret:(NSString *)inSecret usingMethod:(
 			MPLog(@"postDataString - %@", postDataString);
 			
 			[aRequest setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
-			[aRequest setValue:[NSString stringWithFormat:@"%d", [postData length]] forHTTPHeaderField:@"Content-Length"];
+			[aRequest setValue:[NSString stringWithFormat:@"%lu", (unsigned long)[postData length]] forHTTPHeaderField:@"Content-Length"];
 			[aRequest setHTTPBody:postData];
 		}
 	} else {
diff --git a/Source/Framework/MPURLRequestParameter.m b/Source/Framework/MPURLRequestParameter.m
index fbeaa08..5effbe2 100644
--- a/Source/Framework/MPURLRequestParameter.m
+++ b/Source/Framework/MPURLRequestParameter.m
@@ -86,7 +86,7 @@ + (NSDictionary *)parameterDictionaryFromString:(NSString *)inString {
 + (NSString *)parameterStringForParameters:(NSArray *)inParameters {
 	NSMutableString *queryString = [[NSMutableString alloc] init];
 	int i = 0;
-	int parameterCount = [inParameters count];	
+	unsigned long parameterCount = [inParameters count];
 	MPURLRequestParameter *aParameter = nil;
 	
 	for (; i < parameterCount; i++) {
diff --git a/Source/Framework/NSURL+MPURLParameterAdditions.m b/Source/Framework/NSURL+MPURLParameterAdditions.m
index aca3286..b072144 100644
--- a/Source/Framework/NSURL+MPURLParameterAdditions.m
+++ b/Source/Framework/NSURL+MPURLParameterAdditions.m
@@ -81,8 +81,8 @@ - (BOOL)domainMatches:(NSString *)inString {
 	NSString *domain = [self host];
 	matches = [domain isIPAddress] && [domain isEqualToString:inString];
 	
-	int domainLength = [domain length];
-	int requestedDomainLength = [inString length];
+	unsigned long domainLength = [domain length];
+	unsigned long requestedDomainLength = [inString length];
 	
 	if (!matches) {
 		if (domainLength > requestedDomainLength) {