diff --git a/config.py b/config.py
index 2bf61724e90..127656f8bf1 100755
--- a/config.py
+++ b/config.py
@@ -20,6 +20,7 @@
 import re
 import os
 import subprocess
+import shutil
 
 # The set of platforms for which this branch supports automated builds
 BUILDBOT_PLATFORM_TRIPLES = (
@@ -789,6 +790,7 @@ def configure_mac(opts):
     validate_target_arch(opts)
     validate_xcode_sdks(opts)
     validate_java_tools(opts)
+    copy_workspace_settings(opts)
 
     args = core_gyp_args(opts) + ['-Dtarget_sdk=' + opts['XCODE_TARGET_SDK'],
                                   '-Dhost_sdk=' + opts['XCODE_HOST_SDK'],
@@ -815,5 +817,23 @@ def configure(args):
     }
     configure_procs[opts['OS']](opts)
 
+def copy_workspace_settings(opts):
+    validate_gyp_settings(opts)
+    if opts['BUILD_EDITION'] == 'commercial':
+        project = os.path.join(opts['GENERATOR_OUTPUT'], '..', 'livecode-commercial.xcodeproj')
+    else:
+        project = os.path.join(opts['GENERATOR_OUTPUT'], 'livecode.xcodeproj')
+
+    xcshareddata = os.path.join(project, 'project.xcworkspace', 'xcshareddata')
+
+    if not os.path.exists(xcshareddata):
+        os.makedirs(xcshareddata)
+
+    workspacesettingsdest= os.path.join(xcshareddata, 'WorkspaceSettings.xcsettings')
+    workspacesettingssource = os.path.join('config', 'WorkspaceSettings.xcsettings')
+
+    if not os.path.exists(workspacesettingsdest):
+        shutil.copyfile(workspacesettingssource, workspacesettingsdest)
+
 if __name__ == '__main__':
     configure(sys.argv[1:])
diff --git a/config/WorkspaceSettings.xcsettings b/config/WorkspaceSettings.xcsettings
new file mode 100644
index 00000000000..f60c042dcf9
--- /dev/null
+++ b/config/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>BuildSystemType</key>
+    <string>Original</string>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/libgraphics/src/drawing.cpp b/libgraphics/src/drawing.cpp
index 02ef49acf4d..58043503c76 100644
--- a/libgraphics/src/drawing.cpp
+++ b/libgraphics/src/drawing.cpp
@@ -1724,13 +1724,13 @@ void MCGDrawingContext::ExecutePath(VisitorT& p_visitor)
                 
             case kMCGDrawingPathOpcodeSmoothCubicTo:
             {
-                MCGPoint t_a, t_b, t_point;
-                if (!Point(t_b) ||
+                MCGPoint t_a, t_point;
+                if (!Point(t_a) ||
                     !Point(t_point))
                 {
                     break;
                 }
-                p_visitor.PathSmoothCubicTo(t_b,
+                p_visitor.PathSmoothCubicTo(t_a,
                                             t_point);
             }
             break;