diff --git a/build/osx/wxiphone.xcodeproj/project.pbxproj b/build/osx/wxiphone.xcodeproj/project.pbxproj
index 79482e0900..422f721df1 100644
--- a/build/osx/wxiphone.xcodeproj/project.pbxproj
+++ b/build/osx/wxiphone.xcodeproj/project.pbxproj
@@ -2834,7 +2834,9 @@
 /* Begin PBXProject section */
 		19367367C9323490BB936F06 /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = A66311F47C8832F6A58105B6 /* Build configuration list for PBXProject "wxiphone" */;
+			attributes = {
+			};
+			buildConfigurationList = A66311F47C8832F6A58105B6 /* Build configuration list for PBXProject "wxiPhone" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -3737,6 +3739,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 477B609FA2373FB58F4C8768 /* wxiphone.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
 					"wxUSE_BASE=1",
@@ -3756,6 +3759,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 477B609FA2373FB58F4C8768 /* wxiphone.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
 					"wxUSE_BASE=1",
@@ -3783,7 +3787,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		A66311F47C8832F6A58105B6 /* Build configuration list for PBXProject "wxiphone" */ = {
+		A66311F47C8832F6A58105B6 /* Build configuration list for PBXProject "wxiPhone" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				55C93151F6053EBCBDD70DF9 /* Debug */,
diff --git a/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj b/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj
index d58c9ee111..2e7972351a 100644
--- a/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj
+++ b/samples/minimal/minimal_iphone.xcodeproj/project.pbxproj
@@ -142,6 +142,8 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_iphone" */;
 			compatibilityVersion = "Xcode 3.1";
 			developmentRegion = English;
@@ -203,6 +205,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD)";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = minimal_iphone;
 			};
@@ -212,6 +215,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD)";
 				PRODUCT_NAME = minimal_iphone;
 			};
 			name = Release;
diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index ffbf99904c..53775b16b3 100644
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -476,11 +476,15 @@ wxFont::wxFont(wxOSXSystemFont font)
     m_refData = new wxFontRefData(ctfont);
 }
 
+#if wxOSX_USE_COCOA
+
 wxFont::wxFont(WX_NSFont nsfont)
 {
     m_refData = new wxFontRefData((CTFontRef)nsfont);
 }
 
+#endif
+
 wxFont::wxFont(CTFontRef font)
 {
     m_refData = new wxFontRefData(font);
diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index a7d65952e3..5c806893b2 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -837,7 +837,7 @@ wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* rendere
     m_ctFont = wxCFRetain(font.OSXGetCTFont());
     m_ctFontAttributes = wxCFRetain(font.OSXGetCTFontAttributes());
 #if wxOSX_USE_IPHONE
-    m_uiFont = font.OSXGetUIFont();
+    m_uiFont = wxCFRetain(font.OSXGetUIFont());
 #endif
 }
 
diff --git a/src/osx/iphone/stattext.mm b/src/osx/iphone/stattext.mm
index 556d3e85c8..c28cbf29e2 100644
--- a/src/osx/iphone/stattext.mm
+++ b/src/osx/iphone/stattext.mm
@@ -80,22 +80,22 @@ wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
     wxUILabel* v = [[wxUILabel alloc] initWithFrame:r];
     v.backgroundColor = [UIColor clearColor];
 
-    UILineBreakMode linebreak = UILineBreakModeWordWrap;
+    NSLineBreakMode linebreak = NSLineBreakByWordWrapping;
     if ( style & wxST_ELLIPSIZE_MASK )
     {
         if ( style & wxST_ELLIPSIZE_MIDDLE )
-            linebreak = UILineBreakModeMiddleTruncation;
+            linebreak = NSLineBreakByTruncatingMiddle;
         else if (style & wxST_ELLIPSIZE_END )
-            linebreak = UILineBreakModeTailTruncation;
+            linebreak = NSLineBreakByTruncatingTail;
         else if (style & wxST_ELLIPSIZE_START )
-            linebreak = UILineBreakModeHeadTruncation;
+            linebreak = NSLineBreakByTruncatingHead;
     }
     [v setLineBreakMode:linebreak];
 
     if (style & wxALIGN_CENTER)
-        [v setTextAlignment: UITextAlignmentCenter];
+        [v setTextAlignment: NSTextAlignmentCenter];
     else if (style & wxALIGN_RIGHT)
-        [v setTextAlignment: UITextAlignmentRight];
+        [v setTextAlignment: NSTextAlignmentRight];
     
     wxWidgetIPhoneImpl* c = new wxStaticTextIPhoneImpl( wxpeer, v );
     return c;