diff --git a/.gitignore b/.gitignore
index 0461c273de..135473c8df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -187,7 +187,7 @@ ipch/
 /w32/Setup/obj
 *dSYM*
 
-/UpgradeLog.*
+/UpgradeLog*.*
 /_UpgradeReport_Files/
 *.aps
 /w32/Library/switch_version.inc
diff --git a/w32/Setup/Setup.2017.wixproj b/w32/Setup/Setup.2017.wixproj
index dd745e8438..bf0aae0498 100644
--- a/w32/Setup/Setup.2017.wixproj
+++ b/w32/Setup/Setup.2017.wixproj
@@ -1032,6 +1032,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHConfFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1045,6 +1046,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHSoundFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1058,6 +1060,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHhtdocsFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1071,6 +1074,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHimagesFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1084,6 +1088,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHfontsFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1097,6 +1102,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHgrammarFilesDir">
     </HeatDirectory>
     <HeatDirectory
@@ -1111,6 +1117,7 @@
         SuppressRegistry="true"
         SuppressCom="true"
         SuppressFragments="true"
+        RunAsSeparateProcess="true"
         PreprocessorVariable="var.FreeSWITCHBaseDir">
     </HeatDirectory>
   </Target>