diff --git a/cpp/src/phonenumbers/phonenumbermatcher.cc b/cpp/src/phonenumbers/phonenumbermatcher.cc
index 0430699cb..9b380d38d 100644
--- a/cpp/src/phonenumbers/phonenumbermatcher.cc
+++ b/cpp/src/phonenumbers/phonenumbermatcher.cc
@@ -207,7 +207,7 @@ class PhoneNumberMatcherRegExps : public Singleton<PhoneNumberMatcherRegExps> {
   scoped_ptr<const RegExp> pattern_;
 
 #ifdef USE_GOOGLE_BASE
-  PhoneNumberMatcherRegExps* PhoneNumberMatcherRegExps::GetInstance() {
+  static PhoneNumberMatcherRegExps* GetInstance() {
     return Singleton<PhoneNumberMatcherRegExps>::get();
   }
 #endif  // USE_GOOGLE_BASE
diff --git a/cpp/test/phonenumbers/phonenumbermatcher_test.cc b/cpp/test/phonenumbers/phonenumbermatcher_test.cc
index 197638b0b..be6ebb27e 100644
--- a/cpp/test/phonenumbers/phonenumbermatcher_test.cc
+++ b/cpp/test/phonenumbers/phonenumbermatcher_test.cc
@@ -526,15 +526,16 @@ TEST_F(PhoneNumberMatcherTest, MatchWithSurroundingZipcodes) {
 TEST_F(PhoneNumberMatcherTest, IsLatinLetter) {
   EXPECT_TRUE(IsLatinLetter('c'));
   EXPECT_TRUE(IsLatinLetter('C'));
-  EXPECT_TRUE(IsLatinLetter(UnicodeString("\xC3\x89" /* "É" */)[0]));
+  EXPECT_TRUE(IsLatinLetter(UnicodeString::fromUTF8("\xC3\x89" /* "É" */)[0]));
   // Combining acute accent.
-  EXPECT_TRUE(IsLatinLetter(UnicodeString("\xCC\x81")[0]));
+  EXPECT_TRUE(IsLatinLetter(UnicodeString::fromUTF8("\xCC\x81")[0]));
   EXPECT_FALSE(IsLatinLetter(':'));
   EXPECT_FALSE(IsLatinLetter('5'));
   EXPECT_FALSE(IsLatinLetter('-'));
   EXPECT_FALSE(IsLatinLetter('.'));
   EXPECT_FALSE(IsLatinLetter(' '));
-  EXPECT_FALSE(IsLatinLetter(UnicodeString("\xE6\x88\x91" /* "我" */)[0]));
+  EXPECT_FALSE(
+      IsLatinLetter(UnicodeString::fromUTF8("\xE6\x88\x91" /* "我" */)[0]));
 }
 
 TEST_F(PhoneNumberMatcherTest, MatchesWithSurroundingLatinChars) {