diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40154ec..893f137 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ project (YAML_CPP)
 set(LIB_TYPE SHARED)
 
 if(IPHONE)
-  set(CMAKE_OSX_SYSROOT iphoneos4.0)
-  set(CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD_32_BIT))
+  set(CMAKE_OSX_SYSROOT iphoneos4.2)
+  set(CMAKE_OSX_ARCHITECTURES "armv6;armv7")
   set(LIB_TYPE)
 endif(IPHONE)
 
diff --git a/src/regeximpl.h b/src/regeximpl.h
index 41a052e..c13f236 100644
--- a/src/regeximpl.h
+++ b/src/regeximpl.h
@@ -58,7 +58,13 @@ namespace YAML
 	template<>
 	inline bool RegEx::IsValidSource<StringCharSource>(const StringCharSource&source) const
 	{
-		return source || m_op == REGEX_EMPTY;
+		switch(m_op) {
+			case REGEX_MATCH:
+			case REGEX_RANGE:
+				return source;
+			default:
+				return true;
+		}
 	}
 
 	template <typename Source>
diff --git a/test/emittertests.cpp b/test/emittertests.cpp
index cfbac82..b81ab68 100644
--- a/test/emittertests.cpp
+++ b/test/emittertests.cpp
@@ -726,6 +726,21 @@ namespace Test
 			out << YAML::Binary("", 0);
 			desiredOutput = "--- !!binary \"\"";
 		}
+		
+		void ColonAtEndOfScalar(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << "a:";
+			desiredOutput = "--- \"a:\"";
+		}
+
+		void ColonAsScalar(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginMap;
+			out << YAML::Key << "apple" << YAML::Value << ":";
+			out << YAML::Key << "banana" << YAML::Value << ":";
+			out << YAML::EndMap;
+			desiredOutput = "---\napple: \":\"\nbanana: \":\"";
+		}
 
 		////////////////////////////////////////////////////////////////////////////////////////////////////////
 		// incorrect emitting
@@ -916,6 +931,8 @@ namespace Test
 		RunEmitterTest(&Emitter::Binary, "binary", passed, total);
 		RunEmitterTest(&Emitter::LongBinary, "long binary", passed, total);
 		RunEmitterTest(&Emitter::EmptyBinary, "empty binary", passed, total);
+		RunEmitterTest(&Emitter::ColonAtEndOfScalar, "colon at end of scalar", passed, total);
+		RunEmitterTest(&Emitter::ColonAsScalar, "colon as scalar", passed, total);
 		
 		RunEmitterErrorTest(&Emitter::ExtraEndSeq, "extra EndSeq", passed, total);
 		RunEmitterErrorTest(&Emitter::ExtraEndMap, "extra EndMap", passed, total);