diff --git a/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj b/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
index 3a05cae1f..95173691c 100755
--- a/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
+++ b/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
@@ -300,10 +300,6 @@
 				GCC_PREFIX_HEADER = ScanTest_Prefix.pch;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				INFOPLIST_FILE = "ScanTest-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/../ZXingWidget/build/Debug-iphoneos\"",
-				);
 				PRODUCT_NAME = ScanTest;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -325,6 +321,12 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				PREBINDING = NO;
 				SDKROOT = iphoneos4.2;
+				WARNING_CFLAGS = (
+					"-Werror",
+					"-Wall",
+					"-Wextra",
+					"-Wno-unused-parameter",
+				);
 			};
 			name = Debug;
 		};
@@ -344,6 +346,12 @@
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				PREBINDING = NO;
 				SDKROOT = iphoneos4.2;
+				WARNING_CFLAGS = (
+					"-Werror",
+					"-Wall",
+					"-Wextra",
+					"-Wno-unused-parameter",
+				);
 			};
 			name = Release;
 		};
diff --git a/iphone/ZXingWidget/Classes/ZXingWidgetController.m b/iphone/ZXingWidget/Classes/ZXingWidgetController.m
index ecfd7f470..1a17f755a 100755
--- a/iphone/ZXingWidget/Classes/ZXingWidgetController.m
+++ b/iphone/ZXingWidget/Classes/ZXingWidgetController.m
@@ -72,7 +72,7 @@
 }
 
 - (void)dealloc {
-  if (beepSound != -1) {
+  if (beepSound != (SystemSoundID)-1) {
     AudioServicesDisposeSystemSoundID(beepSound);
   }
   
@@ -231,7 +231,7 @@
 
 - (void)presentResultForString:(NSString *)resultString {
   self.result = [ResultParser parsedResultForString:resultString];
-  if (beepSound != -1) {
+  if (beepSound != (SystemSoundID)-1) {
     AudioServicesPlaySystemSound(beepSound);
   }
 #ifdef DEBUG
diff --git a/iphone/ZXingWidget/Classes/actions/AddContactAction.m b/iphone/ZXingWidget/Classes/actions/AddContactAction.m
index d8c440a82..fa976df0a 100644
--- a/iphone/ZXingWidget/Classes/actions/AddContactAction.m
+++ b/iphone/ZXingWidget/Classes/actions/AddContactAction.m
@@ -70,7 +70,7 @@
                             stringByTrimmingCharactersInSet:whitespaceSet] 
                            componentsSeparatedByCharactersInSet:whitespaceSet];
     ABRecordSetValue(person, kABPersonFirstNameProperty, [firstNames objectAtIndex:0], error);
-    for (int i = 1; i < [firstNames count]; i++) {
+    for (unsigned i = 1; i < [firstNames count]; i++) {
       ABRecordSetValue(person, kABPersonMiddleNameProperty, [firstNames objectAtIndex:1], error);
     }
   } else {
@@ -237,5 +237,6 @@
   [urlString release];
   [address release];
   [organization release];
+  [super dealloc];
 }
 @end
diff --git a/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj b/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj
index 36655b7af..80f77c1ea 100644
--- a/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj
+++ b/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj
@@ -1214,7 +1214,12 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PREBINDING = NO;
 				SDKROOT = iphoneos4.2;
-				WARNING_CFLAGS = "-Werror";
+				WARNING_CFLAGS = (
+					"-Wall",
+					"-Wextra",
+					"-Werror",
+					"-Wno-unused-parameter",
+				);
 			};
 			name = Debug;
 		};
@@ -1223,7 +1228,6 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../cpp/core/src;
@@ -1231,7 +1235,12 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PREBINDING = NO;
 				SDKROOT = iphoneos4.2;
-				WARNING_CFLAGS = "-Werror";
+				WARNING_CFLAGS = (
+					"-Wall",
+					"-Wextra",
+					"-Werror",
+					"-Wno-unused-parameter",
+				);
 			};
 			name = Release;
 		};