diff --git a/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint b/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
index 4ef1df7ad..31fe8d4ab 100644
--- a/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
+++ b/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
@@ -4,20 +4,20 @@
 
   },
   "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "90530B99EB0008E7A50951FDFBE02169118FA649" : 0,
+    "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : 0,
+    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : 0,
     "ABB939127996C66F7E852A780552ADEEF03C6B13" : 0,
     "8176314449001F06FB0E5B588C62133EAA2FE911" : 9223372036854775807,
-    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : 0,
-    "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : 0,
-    "90530B99EB0008E7A50951FDFBE02169118FA649" : 0,
     "D74FB800F048CB516BB4BC70047F7CC676D291B9" : 0
   },
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D0F297E7-A82D-4657-A941-96B268F80ABC",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "ABB939127996C66F7E852A780552ADEEF03C6B13" : "SocketRocket\/",
-    "8176314449001F06FB0E5B588C62133EAA2FE911" : "Signal-iOS\/Carthage\/",
-    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "SignalServiceKit\/",
-    "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : "Signal-iOS\/",
     "90530B99EB0008E7A50951FDFBE02169118FA649" : "JSQMessagesViewController\/",
+    "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : "Signal-iOS-5\/",
+    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "SignalServiceKit\/",
+    "ABB939127996C66F7E852A780552ADEEF03C6B13" : "SocketRocket\/",
+    "8176314449001F06FB0E5B588C62133EAA2FE911" : "Signal-iOS-5\/Carthage\/",
     "D74FB800F048CB516BB4BC70047F7CC676D291B9" : "Signal-iOS\/Pods\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Signal",
@@ -27,7 +27,7 @@
     {
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/SignalProtocolKit.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "01DE8628B025BC69C8C7D8B4612D57BE2C08B62C"
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "37054CE35CE656680D6FFFA9EE19249E0D149C5E"
     },
     {
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:FredericJacobs\/TextSecureKit.git",
diff --git a/Signal/src/view controllers/CountryCodeViewController.m b/Signal/src/view controllers/CountryCodeViewController.m
index 22d5c80ae..b2f7fb504 100644
--- a/Signal/src/view controllers/CountryCodeViewController.m	
+++ b/Signal/src/view controllers/CountryCodeViewController.m	
@@ -51,7 +51,7 @@ static NSString *const kUnwindToCountryCodeWasSelectedSegue = @"UnwindToCountryC
     } else if ([countryCode isEqualToString:@"CP"]) {
         // Clipperton Island
         //
-        // This country code should be filtered.
+        // This country code should be filtered - it does not appear to have a calling code.
         return nil;
     } else if ([countryCode isEqualToString:@"DG"]) {
         // Diego Garcia
@@ -61,9 +61,7 @@ static NSString *const kUnwindToCountryCodeWasSelectedSegue = @"UnwindToCountryC
         callingCode = @"+262";
     } else if ([countryCode isEqualToString:@"HM"]) {
         // Heard & McDonald Islands
-        //
-        // This country code should be filtered.
-        return nil;
+        callingCode = @"+672";
     } else if ([countryCode isEqualToString:@"XK"]) {
         // Kosovo
         callingCode = @"+383";