diff --git a/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBControlCore.xcscheme b/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBControlCore.xcscheme
index 9fdc0feb9..f21042834 100644
--- a/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBControlCore.xcscheme
+++ b/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBControlCore.xcscheme
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EEBD600D1C90628F00298A07"
+            BuildableName = "FBControlCore.framework"
+            BlueprintName = "FBControlCore"
+            ReferencedContainer = "container:FBSimulatorControl.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EEBD600D1C90628F00298A07"
-            BuildableName = "FBControlCore.framework"
-            BlueprintName = "FBControlCore"
-            ReferencedContainer = "container:FBSimulatorControl.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:FBSimulatorControl.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Shims/Shimulator/Configs/Shimulator.xcconfig b/Shims/Shimulator/Configs/Shimulator.xcconfig
index 20ab27166..33ac6162d 100644
--- a/Shims/Shimulator/Configs/Shimulator.xcconfig
+++ b/Shims/Shimulator/Configs/Shimulator.xcconfig
@@ -5,7 +5,7 @@ DYLIB_CURRENT_VERSION = 1
 DYLIB_COMPATIBILITY_VERSION = 1
 PRODUCT_NAME = Shimulator
 EXECUTABLE_PREFIX = lib
-SDKROOT = iphoneos
+SDKROOT = iphonesimulator
 IPHONEOS_DEPLOYMENT_TARGET = 10.0
 COPY_PHASE_STRIP = NO
 ARCHS = x86_64