diff --git a/Configs/App-Debug.xcconfig b/Configs/App-Debug.xcconfig
index 2043ccce..f9ba7bef 100644
--- a/Configs/App-Debug.xcconfig
+++ b/Configs/App-Debug.xcconfig
@@ -6,3 +6,6 @@
 
 // If enabled, only the active architecture is built.
 ONLY_ACTIVE_ARCH = YES
+
+// Activating this setting indicates that the target or project should generate bitcode during compilation for platforms and architectures that support it. For Archive builds, bitcode will be generated in the linked binary for submission to the App Store. For other builds, the compiler and linker will check whether the code complies with the requirements for bitcode generation, but will not generate actual bitcode.
+ENABLE_BITCODE = NO
diff --git a/Configs/Module-Debug.xcconfig b/Configs/Module-Debug.xcconfig
index 7a80c401..c048e461 100644
--- a/Configs/Module-Debug.xcconfig
+++ b/Configs/Module-Debug.xcconfig
@@ -15,6 +15,9 @@ ENABLE_NS_ASSERTIONS = YES
 // When this setting is activated, the product will be built with options appropriate for running automated tests, such as making private interfaces accessible to the tests.
 ENABLE_TESTABILITY = YES
 
+// Activating this setting indicates that the target or project should generate bitcode during compilation for platforms and architectures that support it. For Archive builds, bitcode will be generated in the linked binary for submission to the App Store. For other builds, the compiler and linker will check whether the code complies with the requirements for bitcode generation, but will not generate actual bitcode.
+ENABLE_BITCODE = NO
+
 // Specifies the degree to which the generated code is optimized for speed and binary size.
 GCC_OPTIMIZATION_LEVEL = 0
 
diff --git a/Configs/Test-Debug.xcconfig b/Configs/Test-Debug.xcconfig
index d3c686e2..ab3e3059 100644
--- a/Configs/Test-Debug.xcconfig
+++ b/Configs/Test-Debug.xcconfig
@@ -3,3 +3,9 @@
 
 #include "Module-Debug.xcconfig"
 #include "Test-Shared.xcconfig"
+
+// If enabled, only the active architecture is built.
+ONLY_ACTIVE_ARCH = YES
+
+// Activating this setting indicates that the target or project should generate bitcode during compilation for platforms and architectures that support it. For Archive builds, bitcode will be generated in the linked binary for submission to the App Store. For other builds, the compiler and linker will check whether the code complies with the requirements for bitcode generation, but will not generate actual bitcode.
+ENABLE_BITCODE = NO
diff --git a/Configs/Test-Release.xcconfig b/Configs/Test-Release.xcconfig
index b3683aed..ddd2a935 100644
--- a/Configs/Test-Release.xcconfig
+++ b/Configs/Test-Release.xcconfig
@@ -3,3 +3,9 @@
 
 #include "Module-Release.xcconfig"
 #include "Test-Shared.xcconfig"
+
+// If enabled, only the active architecture is built.
+ONLY_ACTIVE_ARCH = NO
+
+// Space-separated list of additional flags to pass to the compiler for C and Objective-C files. Be sure to backslash-escape any arguments that contain spaces or special characters, such as path names that may contain spaces. Use this setting if Xcode does not already provide UI for a particular C or Objective-C compiler flag.
+OTHER_CFLAGS = -DNS_BLOCK_ASSERTIONS=1
diff --git a/SDWebImage.xcworkspace/contents.xcworkspacedata b/SDWebImage.xcworkspace/contents.xcworkspacedata
index 3d719145..9e1946b2 100644
--- a/SDWebImage.xcworkspace/contents.xcworkspacedata
+++ b/SDWebImage.xcworkspace/contents.xcworkspacedata
@@ -2,7 +2,7 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:Examples/../SDWebImage.xcodeproj">
+      location = "group:SDWebImage.xcodeproj">
    </FileRef>
    <FileRef
       location = "group:Examples/SDWebImage Demo.xcodeproj">
diff --git a/Tests/SDWebImage Tests.xcodeproj/project.pbxproj b/Tests/SDWebImage Tests.xcodeproj/project.pbxproj
index e53ee549..87dca370 100644
--- a/Tests/SDWebImage Tests.xcodeproj/project.pbxproj	
+++ b/Tests/SDWebImage Tests.xcodeproj/project.pbxproj	
@@ -534,7 +534,6 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
-				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Tests Mac/Info.plist";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
@@ -550,7 +549,6 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
-				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Tests Mac/Info.plist";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;