diff --git a/Parse.xcodeproj/project.pbxproj b/Parse.xcodeproj/project.pbxproj
index 7f5bb1aeb..d2d9f46b2 100644
--- a/Parse.xcodeproj/project.pbxproj
+++ b/Parse.xcodeproj/project.pbxproj
@@ -3497,7 +3497,7 @@
 /* Begin PBXLegacyTarget section */
 		81493A931A0D3492008D5504 /* BoltsSDK-OSX */ = {
 			isa = PBXLegacyTarget;
-			buildArgumentsString = "$(SRCROOT)/Vendor/Bolts-ObjC/ \\\n$(SRCROOT)/Vendor/Bolts-ObjC/build/ \\\n'Vendor/Bolts-ObjC/scripts/build_framework.sh -n -c Release'";
+			buildArgumentsString = "\"$(SRCROOT)/Vendor/Bolts-ObjC/\" \\\n'Vendor/Bolts-ObjC/scripts/build_framework.sh -n -c Release'";
 			buildConfigurationList = 81493A941A0D3493008D5504 /* Build configuration list for PBXLegacyTarget "BoltsSDK-OSX" */;
 			buildPhases = (
 			);
@@ -3511,7 +3511,7 @@
 		};
 		F569F07A1B14DB1E00296F73 /* BoltsSDK-iOS */ = {
 			isa = PBXLegacyTarget;
-			buildArgumentsString = "$(SRCROOT)/Vendor/Bolts-ObjC/ \\\n$(SRCROOT)/Vendor/Bolts-ObjC/build/ \\\n'Vendor/Bolts-ObjC/scripts/build_framework.sh -n -c Release'";
+			buildArgumentsString = "\"$(SRCROOT)/Vendor/Bolts-ObjC/\" \\\n'Vendor/Bolts-ObjC/scripts/build_framework.sh -n -c Release'";
 			buildConfigurationList = F569F07B1B14DB1E00296F73 /* Build configuration list for PBXLegacyTarget "BoltsSDK-iOS" */;
 			buildPhases = (
 			);
diff --git a/Scripts/build_third_party.sh b/Scripts/build_third_party.sh
index 6a8fc8713..002a51e4c 100755
--- a/Scripts/build_third_party.sh
+++ b/Scripts/build_third_party.sh
@@ -14,33 +14,33 @@ if [[ $ACTION == "clean" ]]; then
   exit 0
 fi
 
-if [[ $1 == "" || $2 == "" || $3 == "" ]]; then
+if [[ $1 == "" || $2 == "" ]]; then
   echo "Use this script to build a third party framework for iOS/OSX."
   echo "It is intended to support building Bolts.framework and FacebookSDK.framework"
-  echo "Usage: 'build_third_party.sh <framework_path> <built_products_dir> <build_script_path>"
+  echo "Usage: 'build_third_party.sh <framework_path> <build_script_path>"
   exit 1
 fi
 
-SOURCE_DIR=$(cd $(dirname $0); pwd)
-FRAMEWORK_DIR=$(cd $1; pwd)
-BUILT_PRODUCTS_DIR=$2
-SCRIPT_PATH=$3
+SOURCE_DIR=$(cd "$(dirname "$0")"; pwd)
+FRAMEWORK_DIR=$(cd "$1"; pwd)
+BUILD_DIR="$1"/build
+SCRIPT_PATH=$2
 
 if [ ! -d "$FRAMEWORK_DIR" ]; then
   echo "Framework path supplied doesn't exist. Please double check it and try again."
   exit 1
 fi
 
-NUM_CHANGES=$(git status --porcelain $FRAMEWORK_DIR | wc -l)
+NUM_CHANGES=$(git status --porcelain "$FRAMEWORK_DIR" | wc -l)
 HAS_CHANGES=$([[ $NUM_CHANGES -gt 0 ]] && echo 1 || echo 0)
 
-BUILD_REVISION_PATH=$BUILT_PRODUCTS_DIR/build_revision
+BUILD_REVISION_PATH=$2/build_revision
 LAST_REVISION=$(git log -n 1 --format=%h .)
 
 if [[ $HAS_CHANGES == 0 ]]; then
   echo "No local changes inside $FRAMEWORK_DIR."
 
-  LAST_BUILD_REVISION=$([ -e $BUILD_REVISION_PATH ] && cat $BUILD_REVISION_PATH || echo 0)
+  LAST_BUILD_REVISION=$([ -e "$BUILD_REVISION_PATH" ] && cat "$BUILD_REVISION_PATH" || echo 0)
 
   if [[ $LAST_REVISION != $LAST_BUILD_REVISION ]]; then
     echo "Found new revision for $FRAMEWORK_DIR. Rebuilding..."
@@ -49,16 +49,15 @@ if [[ $HAS_CHANGES == 0 ]]; then
 fi
 
 if [[ $HAS_CHANGES == 1 ]]; then
-  SCRIPTS_DIR=$(dirname "$3")
-  SCRIPT_FILE=$(basename "$3")
+  SCRIPTS_DIR=$(dirname "$SCRIPT_PATH")
+  SCRIPT_FILE=$(basename "$SCRIPT_PATH")
 
   cd $SCRIPTS_DIR
-
   eval "XCTOOL=xcodebuild ./$SCRIPT_FILE"
   BUILD_RESULT=$?
 
   if [[ $BUILD_RESULT == 0 ]]; then
-    cd $SOURCE_DIR
-    echo $LAST_REVISION > $BUILD_REVISION_PATH
+    cd "$BUILD_DIR"
+    echo $LAST_REVISION > build_revision
   fi
 fi
diff --git a/Scripts/xctask/build_framework_task.rb b/Scripts/xctask/build_framework_task.rb
index 3f8ce93a9..d847f39b9 100755
--- a/Scripts/xctask/build_framework_task.rb
+++ b/Scripts/xctask/build_framework_task.rb
@@ -112,7 +112,7 @@ def build_framework(sdk)
         t.actions = [BuildAction::CLEAN, BuildAction::BUILD]
         t.formatter = BuildFormatter::XCPRETTY
 
-        t.additional_options = { 'CONFIGURATION_BUILD_DIR' => "#{configuration_directory}" }
+        t.additional_options = { 'CONFIGURATION_BUILD_DIR' => "'#{configuration_directory}'" }
       end
 
       result = build_task.execute