diff --git a/OTRRouting/OTRRoutingController.m b/OTRRouting/OTRRoutingController.m
index 8ce3d1c..0b26c76 100644
--- a/OTRRouting/OTRRoutingController.m
+++ b/OTRRouting/OTRRoutingController.m
@@ -57,12 +57,14 @@ - (NSURLSessionDataTask * _Nullable)requestRouteWithLocations:(NSArray<OTRRoutin
     }
     jsonParameters[@"costing_options"] = costingOptions;
   }
-  
+
+  NSString *languageCode = [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode];
+
   if(!directionsOptions) {
-    directionsOptions = [NSDictionary dictionaryWithObject:[NSLocale currentLocale].languageCode forKey:@"language"];
+    directionsOptions = [NSDictionary dictionaryWithObject:languageCode forKey:@"language"];
   } else if (![directionsOptions.allKeys containsObject:@"language"]) {
     NSMutableDictionary *mutableOptions = [directionsOptions mutableCopy];
-    [mutableOptions setObject:[NSLocale currentLocale].languageCode forKey:@"language"];
+    [mutableOptions setObject:languageCode forKey:@"language"];
     directionsOptions = mutableOptions;
   }
   if(![NSJSONSerialization isValidJSONObject:directionsOptions]) {
diff --git a/TBMapzenRouting.xcodeproj/project.pbxproj b/TBMapzenRouting.xcodeproj/project.pbxproj
index 3b6cbf8..9e4e6ec 100644
--- a/TBMapzenRouting.xcodeproj/project.pbxproj
+++ b/TBMapzenRouting.xcodeproj/project.pbxproj
@@ -249,7 +249,7 @@
 		884C2B501D411E48003E29FA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0910;
 				ORGANIZATIONNAME = "Trailbehind inc.";
 				TargetAttributes = {
 					884C2B571D411E48003E29FA = {
@@ -363,14 +363,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -409,14 +415,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/TBMapzenRouting.xcodeproj/xcshareddata/xcschemes/OTRRouting.xcscheme b/TBMapzenRouting.xcodeproj/xcshareddata/xcschemes/OTRRouting.xcscheme
index 500a727..3779f89 100644
--- a/TBMapzenRouting.xcodeproj/xcshareddata/xcschemes/OTRRouting.xcscheme
+++ b/TBMapzenRouting.xcodeproj/xcshareddata/xcschemes/OTRRouting.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0910"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/TBMapzenRouting.xcodeproj/xcshareddata/xcschemes/on_the_road.xcscheme b/TBMapzenRouting.xcodeproj/xcshareddata/xcschemes/on_the_road.xcscheme
index 801f14a..e6f119f 100644
--- a/TBMapzenRouting.xcodeproj/xcshareddata/xcschemes/on_the_road.xcscheme
+++ b/TBMapzenRouting.xcodeproj/xcshareddata/xcschemes/on_the_road.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0910"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"