diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 7f8c56558..e0f56aad2 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -123,11 +123,11 @@ jobs:
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.slam
 
           # Run GTSAM_UNSTABLE tests
+          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.geometry_unstable
+          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.linear_unstable
+          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.discrete_unstable
+          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.dynamics_unstable
+          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.nonlinear_unstable
+          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.slam_unstable
+          cmake --build build -j4 --config ${{ matrix.build_type }} --target check.partition
           cmake --build build -j4 --config ${{ matrix.build_type }} --target check.base_unstable
-          # cmake --build build -j4 --config ${{ matrix.build_type }} --target check.geometry_unstable
-          # cmake --build build -j4 --config ${{ matrix.build_type }} --target check.linear_unstable
-          # cmake --build build -j4 --config ${{ matrix.build_type }} --target check.discrete_unstable
-          # cmake --build build -j4 --config ${{ matrix.build_type }} --target check.dynamics_unstable
-          # cmake --build build -j4 --config ${{ matrix.build_type }} --target check.nonlinear_unstable
-          # cmake --build build -j4 --config ${{ matrix.build_type }} --target check.slam_unstable
-          # cmake --build build -j4 --config ${{ matrix.build_type }} --target check.partition
diff --git a/gtsam/hybrid/HybridFactorGraph.h b/gtsam/hybrid/HybridFactorGraph.h
index b8e7ff588..8b59fd4f9 100644
--- a/gtsam/hybrid/HybridFactorGraph.h
+++ b/gtsam/hybrid/HybridFactorGraph.h
@@ -35,7 +35,7 @@ using SharedFactor = std::shared_ptr<Factor>;
  * Hybrid Factor Graph
  * Factor graph with utilities for hybrid factors.
  */
-class HybridFactorGraph : public FactorGraph<Factor> {
+class GTSAM_EXPORT HybridFactorGraph : public FactorGraph<Factor> {
  public:
   using Base = FactorGraph<Factor>;
   using This = HybridFactorGraph;              ///< this class
diff --git a/gtsam/hybrid/HybridSmoother.h b/gtsam/hybrid/HybridSmoother.h
index 0767da12f..5c2e4f546 100644
--- a/gtsam/hybrid/HybridSmoother.h
+++ b/gtsam/hybrid/HybridSmoother.h
@@ -24,7 +24,7 @@
 
 namespace gtsam {
 
-class HybridSmoother {
+class GTSAM_EXPORT HybridSmoother {
  private:
   HybridBayesNet hybridBayesNet_;
   HybridGaussianFactorGraph remainingFactorGraph_;
diff --git a/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp b/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp
index 8276264ae..073f49c04 100644
--- a/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp
+++ b/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp
@@ -43,6 +43,7 @@
 #include <iostream>
 #include <iterator>
 #include <vector>
+#include <numeric>
 
 #include "Switching.h"
 #include "TinyHybridExample.h"