diff --git a/build/build.ps1 b/build/build.ps1
index 113b95d747..c7deb59f1e 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -69,6 +69,9 @@
     $global:node_nodepath = $this.ClearEnvVar("NODEPATH")
     $global:node_npmcache = $this.ClearEnvVar("NPM_CONFIG_CACHE")
     $global:node_npmprefix = $this.ClearEnvVar("NPM_CONFIG_PREFIX")
+    
+    # https://github.com/gruntjs/grunt-contrib-connect/issues/235
+    $this.SetEnvVar("NODE_NO_HTTP2", "1")
   })
 
   $ubuild.DefineMethod("RestoreNode",
@@ -78,6 +81,8 @@
     $this.SetEnvVar("NODEPATH", $node_nodepath)
     $this.SetEnvVar("NPM_CONFIG_CACHE", $node_npmcache)
     $this.SetEnvVar("NPM_CONFIG_PREFIX", $node_npmprefix)
+    
+    $ignore = $this.ClearEnvVar("NODE_NO_HTTP2")
   })
 
   $ubuild.DefineMethod("CompileBelle",
@@ -124,7 +129,7 @@
 
     Write-Output "### install gulp-cli" >> $log 2>&1
     &npm install -g gulp-cli --quiet >> $log 2>&1
-    if (-not $?) { throw "Failed to install gulp-cli" } # that one is expected to work
+    $error.Clear() # that one fails 'cos some files not being removed - ignore
 
     Write-Output "### gulp build for version $($this.Version.Release)" >> $log 2>&1
     &gulp build --buildversion=$this.Version.Release >> $log 2>&1
@@ -433,7 +438,7 @@
     Write-Host "Prepare Azure Gallery"
     $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
   })
-
+  
   $ubuild.DefineMethod("Build",
   {
     $error.Clear()
@@ -463,6 +468,7 @@
     if ($this.OnError()) { return }
     $this.PrepareAzureGallery()
     if ($this.OnError()) { return }
+    Write-Host "Done"
   })
 
   # ################################################################
@@ -478,5 +484,4 @@
     $ubuild.Build()
     if ($ubuild.OnError()) { return }
   }
-  Write-Host "Done"
   if ($get) { return $ubuild }