diff --git a/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props b/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props
index 0b31d90..2a017e5 100644
--- a/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props
+++ b/InstallerResources/PPAPI_Patch/ImportAfter/PPAPI.override.props
@@ -42,8 +42,8 @@
   <PropertyGroup>
     <TargetPath Condition="'$(TargetPath)' == ''">$([System.IO.Path]::Combine($(ProjectDir),$(OutDir)$(TargetName)$(TargetExt)))</TargetPath>
     <LocalDebuggerCommand>$(CHROME_PATH)</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments Condition="$(Configuration) == 'Debug'">--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServerPort) --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl --wait-for-debugger-children --no-sandbox</LocalDebuggerCommandArguments>
-    <LocalDebuggerCommandArguments Condition="$(Configuration) != 'Debug'">--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServerPort) --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments Condition="$(Configuration) == 'Debug'">--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServerPort) --user-data-dir="$(ProjectDir)/chrome_data" --wait-for-debugger-children</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments Condition="$(Configuration) != 'Debug'">--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServerPort) --user-data-dir="$(ProjectDir)/chrome_data"</LocalDebuggerCommandArguments>
     <LinkIncremental Condition="$(Configuration) == 'Debug'">true</LinkIncremental>
     <LinkIncremental Condition="$(Configuration) != 'Debug'">false</LinkIncremental>
   </PropertyGroup>
diff --git a/InstallerResources/examples/hello_nacl_cpp/hello_nacl_cpp/hello_nacl_cpp.vcxproj.user b/InstallerResources/examples/hello_nacl_cpp/hello_nacl_cpp/hello_nacl_cpp.vcxproj.user
deleted file mode 100644
index 852838e..0000000
--- a/InstallerResources/examples/hello_nacl_cpp/hello_nacl_cpp/hello_nacl_cpp.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'">
-    <LocalDebuggerCommand>C:\Program Files (x86)\Google\Chrome\Application\chrome.exe</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServerPort) --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl --wait-for-debugger-children --no-sandbox</LocalDebuggerCommandArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'">
-    <LocalDebuggerCommand>C:\Program Files (x86)\Google\Chrome\Application\chrome.exe</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServerPort) --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl</LocalDebuggerCommandArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64'">
-    <LocalDebuggerCommand>C:\Program Files (x86)\Google\Chrome\Application\chrome.exe</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>--enable-nacl-debug --no-sandbox localhost:$(NaClWebServerPort) --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl</LocalDebuggerCommandArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl64'">
-    <LocalDebuggerCommand>C:\Program Files (x86)\Google\Chrome\Application\chrome.exe</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>localhost:$(NaClWebServerPort) --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl</LocalDebuggerCommandArguments>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj.user b/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj.user
index 7f5c610..4b63829 100644
--- a/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj.user
+++ b/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj.user
@@ -7,9 +7,9 @@
     <LocalDebuggerCommandArguments>localhost:$(NaClWebServerPort)/index_$(ToolchainName).html --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl</LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PPAPI'">
-    <LocalDebuggerCommandArguments>--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServerPort)/index_win.html --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl --wait-for-debugger-children --no-sandbox</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServerPort)/index_win.html --user-data-dir="$(ProjectDir)/chrome_data" --wait-for-debugger-children</LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PPAPI'">
-    <LocalDebuggerCommandArguments>--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServerPort)/index_win.html --user-data-dir="$(ProjectDir)/chrome_data" --enable-nacl</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>--register-pepper-plugins="$(TargetPath)";application/x-nacl localhost:$(NaClWebServerPort)/index_win.html --user-data-dir="$(ProjectDir)/chrome_data"</LocalDebuggerCommandArguments>
   </PropertyGroup>
 </Project>
diff --git a/UnitTests/ProjectSettingsTest.cs b/UnitTests/ProjectSettingsTest.cs
index 76a05c3..44a4820 100644
--- a/UnitTests/ProjectSettingsTest.cs
+++ b/UnitTests/ProjectSettingsTest.cs
@@ -255,16 +255,12 @@
       string propName = "LocalDebuggerCommandArguments";
       string dataDir = "--user-data-dir=\"$(ProjectDir)/chrome_data\"";
       string address = "localhost:$(NaClWebServerPort)";
-      string naclFlag = "--enable-nacl";
       string targetFlag = "--register-pepper-plugins=\"$(TargetPath)\";application/x-nacl";
-      string noSandBoxFlag = "--no-sandbox";
       string debugChildrenFlag = "--wait-for-debugger-children";
       AllConfigsAssertPropertyContains(page, propName, dataDir, true);
       AllConfigsAssertPropertyContains(page, propName, address, true);
-      AllConfigsAssertPropertyContains(page, propName, naclFlag, true);
       AllConfigsAssertPropertyContains(page, propName, targetFlag, true);
       TestUtilities.AssertPropertyContains(debug_, page, propName, debugChildrenFlag, true);
-      TestUtilities.AssertPropertyContains(debug_, page, propName, noSandBoxFlag, true);
 
       // VC++ Directories
       page = "ConfigurationDirectories";
diff --git a/create_package.py b/create_package.py
index df3c4a7..44050a4 100644
--- a/create_package.py
+++ b/create_package.py
@@ -53,6 +53,9 @@
     r'examples\\.*\\Debug',
     r'examples\\.*\\newlib',
     r'examples\\.*\\win',
+    r'examples\\.*\\ipch',
+    r'examples\\.*\\*.sdf',
+    r'examples\\.*\\*.suo',
     # Exclude .AddIn file for now since we need to modify it with version info.
     re.escape(ADDIN_METADATA)]