diff --git a/Configuration/Shared.xcconfig b/Configuration/Shared.xcconfig
index 94eeb00a5..5c36bbc13 100644
--- a/Configuration/Shared.xcconfig
+++ b/Configuration/Shared.xcconfig
@@ -8,9 +8,11 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES
 CLANG_WARN_EMPTY_BODY = YES
 CLANG_WARN_ENUM_CONVERSION = YES
 CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES
+CLANG_WARN_INFINITE_RECURSION = YES
 CLANG_WARN_INT_CONVERSION = YES
 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR
 CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES
+CLANG_WARN_SUSPICIOUS_MOVE = YES
 CLANG_WARN_UNREACHABLE_CODE = YES
 COMBINE_HIDPI_IMAGES = YES
 DEBUG_INFORMATION_FORMAT = dwarf
diff --git a/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBControlCore.xcscheme b/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBControlCore.xcscheme
index c0e3a3acb..3053ef26b 100644
--- a/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBControlCore.xcscheme
+++ b/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBControlCore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBDeviceControl.xcscheme b/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBDeviceControl.xcscheme
index c071a7664..905455b65 100644
--- a/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBDeviceControl.xcscheme
+++ b/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBDeviceControl.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBSimulatorControl.xcscheme b/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBSimulatorControl.xcscheme
index d026fc3d7..d45fd2aae 100644
--- a/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBSimulatorControl.xcscheme
+++ b/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/FBSimulatorControl.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/XCTestBootstrap.xcscheme b/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/XCTestBootstrap.xcscheme
index 1e3699a3c..a4b53205e 100644
--- a/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/XCTestBootstrap.xcscheme
+++ b/FBSimulatorControl.xcodeproj/xcshareddata/xcschemes/XCTestBootstrap.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/fbsimctl/FBSimulatorControlKit/FBSimulatorControlKit.xcconfig b/fbsimctl/FBSimulatorControlKit/FBSimulatorControlKit.xcconfig
index 2b05c8753..d05494b60 100644
--- a/fbsimctl/FBSimulatorControlKit/FBSimulatorControlKit.xcconfig
+++ b/fbsimctl/FBSimulatorControlKit/FBSimulatorControlKit.xcconfig
@@ -4,7 +4,9 @@
 
 // Target Specific Settings
 EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
+ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 SWIFT_VERSION = 3.0
+SWIFT_OPTIMIZATION_LEVEL = -Owholemodule
 PRODUCT_NAME = FBSimulatorControlKit
 INFOPLIST_FILE = $(PROJECT_DIR)/FBSimulatorControlKit/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.facebook.FBSimulatorControlKit
diff --git a/fbsimctl/FBSimulatorControlKitTests/FBSimulatorControlKitTests.xcconfig b/fbsimctl/FBSimulatorControlKitTests/FBSimulatorControlKitTests.xcconfig
index 754586d12..4a1f225a1 100644
--- a/fbsimctl/FBSimulatorControlKitTests/FBSimulatorControlKitTests.xcconfig
+++ b/fbsimctl/FBSimulatorControlKitTests/FBSimulatorControlKitTests.xcconfig
@@ -3,7 +3,9 @@
 
 // Target Specific Settings
 EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
+ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 SWIFT_VERSION = 3.0
+SWIFT_OPTIMIZATION_LEVEL = -Owholemodule
 PRODUCT_NAME = FBSimulatorControlKitTests
 INFOPLIST_FILE = $(PROJECT_DIR)/FBSimulatorControlKitTests/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.facebook.FBSimulatorControlKitTests
diff --git a/fbsimctl/fbsimctl.xcodeproj/xcshareddata/xcschemes/FBSimulatorControlKit.xcscheme b/fbsimctl/fbsimctl.xcodeproj/xcshareddata/xcschemes/FBSimulatorControlKit.xcscheme
index 150c22f02..d175297eb 100644
--- a/fbsimctl/fbsimctl.xcodeproj/xcshareddata/xcschemes/FBSimulatorControlKit.xcscheme
+++ b/fbsimctl/fbsimctl.xcodeproj/xcshareddata/xcschemes/FBSimulatorControlKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/fbsimctl/fbsimctl.xcodeproj/xcshareddata/xcschemes/fbsimctl.xcscheme b/fbsimctl/fbsimctl.xcodeproj/xcshareddata/xcschemes/fbsimctl.xcscheme
index be235e938..3d212a868 100644
--- a/fbsimctl/fbsimctl.xcodeproj/xcshareddata/xcschemes/fbsimctl.xcscheme
+++ b/fbsimctl/fbsimctl.xcodeproj/xcshareddata/xcschemes/fbsimctl.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"