diff --git a/3rdParty/iresearch/external/snowball/CMakeLists.txt b/3rdParty/iresearch/external/snowball/CMakeLists.txt
index 834d6ad0e5..a6b7188074 100644
--- a/3rdParty/iresearch/external/snowball/CMakeLists.txt
+++ b/3rdParty/iresearch/external/snowball/CMakeLists.txt
@@ -17,11 +17,11 @@ INCLUDE(CheckCCompilerFlag)
 INCLUDE(FindPerl)
 
 IF(NOT PERL_FOUND)
-	MESSAGE(FATAL "Perl required to build snowball")
+    MESSAGE(FATAL_ERROR "Perl required to build snowball")
 ENDIF()
 
 IF(NOT STEMMER_SOURCE_DIR)
-	MESSAGE(FATAL "Source directory required to build snowball")
+    MESSAGE(FATAL_ERROR "Source directory required to build snowball")
 ENDIF()
 
 SET(CMAKE_CURRENT_SOURCE_DIR "${STEMMER_SOURCE_DIR}")
diff --git a/Installation/Pipeline/Jenkinsfile.groovy b/Installation/Pipeline/Jenkinsfile.groovy
index 41d1afd8fb..11ddc34dbc 100644
--- a/Installation/Pipeline/Jenkinsfile.groovy
+++ b/Installation/Pipeline/Jenkinsfile.groovy
@@ -1351,7 +1351,11 @@ def buildEdition(os, edition, maintainer) {
             }
         }
         else if (os == 'windows') {
-            logFile = "..\\" + logFile
+            echo "starting windows configure and build"
+            workspace = "${env.WORKSPACE}"
+            workspace = workspace.replace("\\", "/")
+            logFile = workspace + "/" + logFile
+
             extra = "-DUSE_CATCH_TESTS=ON -DUSE_FAILURE_TESTS=ON -DDEBUG_SYNC_REPLICATION=ON"
             if( edition == "enterprise"){
                 extra += " -DUSE_ENTERPRISE=ON"
@@ -1363,7 +1367,7 @@ def buildEdition(os, edition, maintainer) {
             powershell "Remove-Item -Force -Recurse ${arch} -ErrorAction SilentlyContinue"
             powershell "New-Item -Force -ItemType Directory ${arch} -ErrorAction SilentlyContinue"
             powershell "New-Item -ItemType Directory -Force -Path build"
-            powershell "cd build; ..\\configure\\${os}_vs2017_RelWithDebInfo.ps1 -build ${extra} | Add-Content -PassThru ${logFile}"
+            powershell "cd build; ..\\configure\\${os}_vs2017_RelWithDebInfo.ps1 -build ${extra} | Add-Content -PassThru -Path \"${logFile}\""
         }
 
         logStopStage(os, logFile)
diff --git a/Installation/Pipeline/Jenkinsfile.groovy.in b/Installation/Pipeline/Jenkinsfile.groovy.in
index 7f8659b87e..0e45236182 100644
--- a/Installation/Pipeline/Jenkinsfile.groovy.in
+++ b/Installation/Pipeline/Jenkinsfile.groovy.in
@@ -1351,7 +1351,11 @@ def buildEdition(os, edition, maintainer) {
             }
         }
         else if (os == 'windows') {
-            logFile = "..\\" + logFile
+            echo "starting windows configure and build"
+            workspace = "${env.WORKSPACE}"
+            workspace = workspace.replace("\\", "/")
+            logFile = workspace + "/" + logFile
+
             extra = "-DUSE_CATCH_TESTS=ON -DUSE_FAILURE_TESTS=ON -DDEBUG_SYNC_REPLICATION=ON"
             if( edition == "enterprise"){
                 extra += " -DUSE_ENTERPRISE=ON"
@@ -1363,7 +1367,7 @@ def buildEdition(os, edition, maintainer) {
             powershell "Remove-Item -Force -Recurse ${arch} -ErrorAction SilentlyContinue"
             powershell "New-Item -Force -ItemType Directory ${arch} -ErrorAction SilentlyContinue"
             powershell "New-Item -ItemType Directory -Force -Path build"
-            powershell "cd build; ..\\configure\\${os}_vs2017_RelWithDebInfo.ps1 -build ${extra} | Add-Content -PassThru ${logFile}"
+            powershell "cd build; ..\\configure\\${os}_vs2017_RelWithDebInfo.ps1 -build ${extra} | Add-Content -PassThru -Path \"${logFile}\""
         }
 
         logStopStage(os, logFile)
diff --git a/configure/windows_common.ps1 b/configure/windows_common.ps1
index 8646ffb538..e56e2a0601 100644
--- a/configure/windows_common.ps1
+++ b/configure/windows_common.ps1
@@ -9,8 +9,8 @@
 #>
 
 # set variables
-$ErrorActionPreference = "Stop"
-$PSDefaultParameterValues['*:ErrorAction']='Stop'
+$ErrorActionPreference = "Continue"
+$PSDefaultParameterValues['*:ErrorAction']='Continue'
 
 $arango_source = split-path -parent $script_path
 
diff --git a/js/server/tests/resilience/shard-distribution-spec.js b/js/server/tests/resilience/shard-distribution-spec.js
index eeb8ea0ee2..b48c815aed 100644
--- a/js/server/tests/resilience/shard-distribution-spec.js
+++ b/js/server/tests/resilience/shard-distribution-spec.js
@@ -171,7 +171,7 @@ describe('Shard distribution', function () {
       // And is followed by a numeric value
       const nr = parseInt(shard.slice(1));
       expect(nr).to.be.above(0);
-      return nr
+      return nr;
     };
 
     const sortShardsNumericly = function (l, r) {