diff --git a/Jenkinsfile b/Jenkinsfile
index 53b9c5ab90..cee2734009 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -92,100 +92,168 @@ parallel tools: {
       )
       recordIssues(
         id: 'tools-cppcheck',
-        tool: cppCheck()
+        tool: cppCheck(pattern: 'build/cppcheck.xml')
       ) 
     }  
     cleanWs()
   } // node('tools')
 },
-linux_gcc: {
-  node('linux' && 'gcc') {
-    stage('linux-gcc/scm') {
-      deleteDir();
-      gitHelper.checkoutGit(url, branch);
-    }
-    stage('linux-gcc/build(make)') {
-        def cmakeCompileOptions = moduleCMakeFlags();
-        cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release';
-        // Not sure why the linking of OpenSpaceTest takes so long
-        compileHelper.build(compileHelper.Make(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-make');
-        compileHelper.recordCompileIssues(compileHelper.Gcc());
-    }
-    stage('linux-gcc/build(ninja)') {
-        def cmakeCompileOptions = moduleCMakeFlags();
-        cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release';
-        // Not sure why the linking of OpenSpaceTest takes so long
-        compileHelper.build(compileHelper.Ninja(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-ninja');
-    }
-    stage('linux-gcc/test') {
-      // testHelper.runUnitTests('build/OpenSpaceTest');
-    }
-    cleanWs()
-  } // node('linux')
-},
-linux_clang: {
-  node('linux' && 'clang') {
-    stage('linux-clang/scm') {
-      deleteDir()
-      gitHelper.checkoutGit(url, branch);
-    }
-    stage('linux-clang/build(make)') {
-        def cmakeCompileOptions = moduleCMakeFlags()
-        cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release'
-        // Not sure why the linking of OpenSpaceTest takes so long
-        compileHelper.build(compileHelper.Make(), compileHelper.Clang(), cmakeCompileOptions, 'OpenSpace', 'build-make');
-        compileHelper.recordCompileIssues(compileHelper.Clang());
-    }
-    stage('linux-clang/build(ninja)') {
-        def cmakeCompileOptions = moduleCMakeFlags()
-        cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release'
-        // Not sure why the linking of OpenSpaceTest takes so long
-        compileHelper.build(compileHelper.Ninja(), compileHelper.Clang(), cmakeCompileOptions, 'OpenSpace', 'build-ninja');
-    }
-    stage('linux-clang/test') {
-      // testHelper.runUnitTests('build/OpenSpaceTest');
-    }
-    cleanWs()
-  } // node('linux')
-},
-windows: {
-  node('windows') {
-    ws("${env.JENKINS_BASE}/O/${env.BRANCH_NAME}/${env.BUILD_ID}") {
-      stage('windows/scm') {
+linux_gcc_make: {
+  if (env.USE_BUILD_OS_LINUX == 'true') {
+    node('linux' && 'gcc') {
+      stage('linux-gcc-make/scm') {
         deleteDir();
         gitHelper.checkoutGit(url, branch);
       }
-      stage('windows/build(msvc)') {
-        compileHelper.build(compileHelper.VisualStudio(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-msvc');
-        compileHelper.recordCompileIssues(compileHelper.VisualStudio());
+      stage('linux-gcc-make/build') {
+          def cmakeCompileOptions = moduleCMakeFlags();
+          cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release';
+          // Not sure why the linking of OpenSpaceTest takes so long
+          compileHelper.build(compileHelper.Make(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-make');
+          compileHelper.recordCompileIssues(compileHelper.Gcc());
       }
-      stage('windows/build(ninja)') {
-        compileHelper.build(compileHelper.Ninja(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-ninja');
+      stage('linux-gcc-make/test') {
+        // testHelper.runUnitTests('build/OpenSpaceTest');
       }
-      stage('windows/test') {
-        // Currently, the unit tests are failing on Windows
-        // testHelper.runUnitTests('bin\\Debug\\OpenSpaceTest')
-      }
-    } // node('windows')
-    cleanWs()
-  } // node('windows')
+      cleanWs()
+    } // node('linux')
+  }
 },
-macos: {
-  node('macos') {
-    stage('macos/scm') {
-      deleteDir();
-      gitHelper.checkoutGit(url, branch);
-    }
-    stage('macos/build(make)') {
-        compileHelper.build(compileHelper.Make(), compileHelper.Clang(), moduleCMakeFlags(), '', 'build-make');
-    }
-    stage('macos/build(xcode)') {
-        compileHelper.build(compileHelper.Xcode(), compileHelper.Xcode(), moduleCMakeFlags(), '', 'build-xcode');
-    }
-    stage('macos/test') {
-      // Currently, the unit tests are crashing on OS X
-      // testHelper.runUnitTests('build/Debug/OpenSpaceTest')
-    }
-    cleanWs()
-  } // node('macos')
+linux_gcc_ninja: {
+  if (env.USE_BUILD_OS_LINUX == 'true') {
+    node('linux' && 'gcc') {
+      stage('linux-gcc-ninja/scm') {
+        deleteDir();
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('linux-gcc-ninja/build') {
+          def cmakeCompileOptions = moduleCMakeFlags();
+          cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release';
+          // Not sure why the linking of OpenSpaceTest takes so long
+          compileHelper.build(compileHelper.Ninja(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-ninja');
+      }
+      stage('linux-gcc-ninja/test') {
+        // testHelper.runUnitTests('build/OpenSpaceTest');
+      }
+      cleanWs()
+    } // node('linux')
+  }
+},
+linux_clang_make: {
+  if (env.USE_BUILD_OS_LINUX == 'true') {
+    node('linux' && 'clang') {
+      stage('linux-clang-make/scm') {
+        deleteDir()
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('linux-clang-make/build') {
+          def cmakeCompileOptions = moduleCMakeFlags()
+          cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release'
+          // Not sure why the linking of OpenSpaceTest takes so long
+          compileHelper.build(compileHelper.Make(), compileHelper.Clang(), cmakeCompileOptions, 'OpenSpace', 'build-make');
+          compileHelper.recordCompileIssues(compileHelper.Clang());
+      }
+      stage('linux-clang-make/test') {
+        // testHelper.runUnitTests('build/OpenSpaceTest');
+      }
+      cleanWs()
+    } // node('linux')
+  }
+},
+linux_clang_ninja: {
+  if (env.USE_BUILD_OS_LINUX == 'true') {
+    node('linux' && 'clang') {
+      stage('linux-clang-ninja/scm') {
+        deleteDir()
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('linux-clang-ninja/build') {
+          def cmakeCompileOptions = moduleCMakeFlags()
+          cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release'
+          // Not sure why the linking of OpenSpaceTest takes so long
+          compileHelper.build(compileHelper.Ninja(), compileHelper.Clang(), cmakeCompileOptions, 'OpenSpace', 'build-ninja');
+      }
+      stage('linux-clang-ninja/test') {
+        // testHelper.runUnitTests('build/OpenSpaceTest');
+      }
+      cleanWs()
+    } // node('linux')
+  }
+},
+windows_msvc: {
+  if (env.USE_BUILD_OS_WINDOWS == 'true') {
+    node('windows') {
+      ws("${env.JENKINS_BASE}/O/${env.BRANCH_NAME}/${env.BUILD_ID}") {
+        stage('windows-msvc/scm') {
+          deleteDir();
+          gitHelper.checkoutGit(url, branch);
+        }
+        stage('windows-msvc/build') {
+          compileHelper.build(compileHelper.VisualStudio(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-msvc');
+          compileHelper.recordCompileIssues(compileHelper.VisualStudio());
+        }
+        stage('windows-msvc/test') {
+          // Currently, the unit tests are failing on Windows
+          // testHelper.runUnitTests('bin\\Debug\\OpenSpaceTest')
+        }
+      } // node('windows')
+      cleanWs()
+    } // node('windows')
+  }
+},
+// windows_ninja: {
+//   if (env.USE_BUILD_OS_WINDOWS == 'true') {
+//     node('windows') {
+//       ws("${env.JENKINS_BASE}/O/${env.BRANCH_NAME}/${env.BUILD_ID}") {
+//         stage('windows-ninja/scm') {
+//           deleteDir();
+//           gitHelper.checkoutGit(url, branch);
+//         }
+//         stage('windows-ninja/build') {
+//           compileHelper.build(compileHelper.Ninja(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-ninja');
+//         }
+//         stage('windows-ninja/test') {
+//           // Currently, the unit tests are failing on Windows
+//           // testHelper.runUnitTests('bin\\Debug\\OpenSpaceTest')
+//         }
+//       } // node('windows')
+//       cleanWs()
+//     } // node('windows')
+//   }
+// },
+macos_make: {
+  if (env.USE_BUILD_OS_MACOS == 'true') {
+    node('macos') {
+      stage('macos-make/scm') {
+        deleteDir();
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('macos-make/build') {
+          compileHelper.build(compileHelper.Make(), compileHelper.Clang(), moduleCMakeFlags(), '', 'build-make');
+      }
+      stage('macos-make/test') {
+        // Currently, the unit tests are crashing on OS X
+        // testHelper.runUnitTests('build/Debug/OpenSpaceTest')
+      }
+      cleanWs()
+    } // node('macos')
+  }
+},
+macos_xcode: {
+  if (env.USE_BUILD_OS_MACOS == 'true') {
+    node('macos') {
+      stage('macos-xcode/scm') {
+        deleteDir();
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('macos-xcode/build') {
+          compileHelper.build(compileHelper.Xcode(), compileHelper.Xcode(), moduleCMakeFlags(), '', 'build-xcode');
+      }
+      stage('macos-xcode/test') {
+        // Currently, the unit tests are crashing on OS X
+        // testHelper.runUnitTests('build/Debug/OpenSpaceTest')
+      }
+      cleanWs()
+    } // node('macos')
+  }
 }
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index dc7d75681b..e1a110f866 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit dc7d75681b1fe5259c7adf7502d99679a01270a8
+Subproject commit e1a110f866afef2b2539100bf02893982b9eb304
diff --git a/ext/ghoul b/ext/ghoul
index d08973205c..37045760b0 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit d08973205c88a2c759d86a679db0d5536df7ee71
+Subproject commit 37045760b03bc0d8cac8e52c22c0d10a791ec16f
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index 27e583f6d8..8453ce627a 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -149,21 +149,6 @@ namespace {
                 throw ghoul::MissingCaseException();
         }
     }
-
-    [[ nodiscard ]] int nLines(
-                           openspace::DashboardItemFramerate::FrametimeType frametimeType)
-    {
-        using FrametimeType = openspace::DashboardItemFramerate::FrametimeType;
-        switch (frametimeType) {
-            case FrametimeType::DtTimeAvg:                return 1;
-            case FrametimeType::DtTimeExtremes:           return 2;
-            case FrametimeType::DtStandardDeviation:      return 1;
-            case FrametimeType::DtCoefficientOfVariation: return 1;
-            case FrametimeType::FPS:                      return 1;
-            case FrametimeType::FPSAvg:                   return 1;
-            default:                                  throw ghoul::MissingCaseException();
-        }
-    }
 } // namespace
 
 namespace openspace {
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index c46038e569..9484b0dd24 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -426,7 +426,7 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
         }
     }
 }
-#pragma optimize("", off)
+
 void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     ZoneScoped
 
diff --git a/modules/webgui/cmake/nodejs_support.cmake b/modules/webgui/cmake/nodejs_support.cmake
index 1296a709eb..c892251c2b 100644
--- a/modules/webgui/cmake/nodejs_support.cmake
+++ b/modules/webgui/cmake/nodejs_support.cmake
@@ -79,7 +79,7 @@ function(DownloadNodeJs version download_dir)
       # Linux uses tar.xz
       message(STATUS "Extracting NodeJs: ${NODEJS_DOWNLOAD_PATH} in ${NODEJS_DOWNLOAD_DIR}")
       execute_process(
-        COMMAND tar xvf ${NODEJS_DOWNLOAD_PATH}
+        COMMAND tar xf ${NODEJS_DOWNLOAD_PATH}
         WORKING_DIRECTORY ${NODEJS_DOWNLOAD_DIR}
       )
     endif()