diff --git a/include/evalhyd/detail/determinist/evaluator.hpp b/include/evalhyd/detail/determinist/evaluator.hpp
index 71a93c1a9443b067eb6e87fea97f15e561687b9e..74b92d0348d3ca49ae0668c4ea6365ec7c904a59 100644
--- a/include/evalhyd/detail/determinist/evaluator.hpp
+++ b/include/evalhyd/detail/determinist/evaluator.hpp
@@ -77,7 +77,7 @@ namespace evalhyd
                 for (std::size_t m = 0; m < n_msk; m++)
                 {
                     xt::view(t_msk, m) =
-                            xt::where(obs_nan | prd_nan,
+                            xt::where(obs_nan || prd_nan,
                                       false, xt::view(t_msk, m));
                 }
             };
diff --git a/include/evalhyd/detail/masks.hpp b/include/evalhyd/detail/masks.hpp
index 46313e55cf80c054aba9a3153968df5a8c12dee3..24a0e872f13cadbb12c649d976d5cb6eebcae440 100644
--- a/include/evalhyd/detail/masks.hpp
+++ b/include/evalhyd/detail/masks.hpp
@@ -303,43 +303,43 @@ namespace evalhyd
                     {
                         if ((opr1 == "<") && (opr2 == ">"))
                         {
-                            t_msk = xt::where((q < val1) & (q > val2),
+                            t_msk = xt::where((q < val1) && (q > val2),
                                               1, t_msk);
                         }
                         else if ((opr1 == "<=") && (opr2 == ">"))
                         {
-                            t_msk = xt::where((q <= val1) & (q > val2),
+                            t_msk = xt::where((q <= val1) && (q > val2),
                                               1, t_msk);
                         }
                         else if ((opr1 == "<") && (opr2 == ">="))
                         {
-                            t_msk = xt::where((q < val1) & (q >= val2),
+                            t_msk = xt::where((q < val1) && (q >= val2),
                                               1, t_msk);
                         }
                         else if ((opr1 == "<=") && (opr2 == ">="))
                         {
-                            t_msk = xt::where((q <= val1) & (q >= val2),
+                            t_msk = xt::where((q <= val1) && (q >= val2),
                                               1, t_msk);
                         }
 
                         if ((opr2 == "<") && (opr1 == ">"))
                         {
-                            t_msk = xt::where((q < val2) & (q > val1),
+                            t_msk = xt::where((q < val2) && (q > val1),
                                               1, t_msk);
                         }
                         else if ((opr2 == "<=") && (opr1 == ">"))
                         {
-                            t_msk = xt::where((q <= val2) & (q > val1),
+                            t_msk = xt::where((q <= val2) && (q > val1),
                                               1, t_msk);
                         }
                         else if ((opr2 == "<") && (opr1 == ">="))
                         {
-                            t_msk = xt::where((q < val2) & (q >= val1),
+                            t_msk = xt::where((q < val2) && (q >= val1),
                                               1, t_msk);
                         }
                         else if ((opr2 == "<=") && (opr1 == ">="))
                         {
-                            t_msk = xt::where((q <= val2) & (q >= val1),
+                            t_msk = xt::where((q <= val2) && (q >= val1),
                                               1, t_msk);
                         }
                     }
@@ -347,43 +347,43 @@ namespace evalhyd
                     {
                         if ((opr1 == "<") && (opr2 == ">"))
                         {
-                            t_msk = xt::where((q < val1) | (q > val2),
+                            t_msk = xt::where((q < val1) || (q > val2),
                                               1, t_msk);
                         }
                         else if ((opr1 == "<=") && (opr2 == ">"))
                         {
-                            t_msk = xt::where((q <= val1) | (q > val2),
+                            t_msk = xt::where((q <= val1) || (q > val2),
                                               1, t_msk);
                         }
                         else if ((opr1 == "<") && (opr2 == ">="))
                         {
-                            t_msk = xt::where((q < val1) | (q >= val2),
+                            t_msk = xt::where((q < val1) || (q >= val2),
                                               1, t_msk);
                         }
                         else if ((opr1 == "<=") && (opr2 == ">="))
                         {
-                            t_msk = xt::where((q <= val1) & (q >= val2),
+                            t_msk = xt::where((q <= val1) && (q >= val2),
                                               1, t_msk);
                         }
 
                         if ((opr2 == "<") && (opr1 == ">"))
                         {
-                            t_msk = xt::where((q < val2) | (q > val1),
+                            t_msk = xt::where((q < val2) || (q > val1),
                                               1, t_msk);
                         }
                         else if ((opr2 == "<=") && (opr1 == ">"))
                         {
-                            t_msk = xt::where((q <= val2) | (q > val1),
+                            t_msk = xt::where((q <= val2) || (q > val1),
                                               1, t_msk);
                         }
                         else if ((opr2 == "<") && (opr1 == ">="))
                         {
-                            t_msk = xt::where((q < val2) | (q >= val1),
+                            t_msk = xt::where((q < val2) || (q >= val1),
                                               1, t_msk);
                         }
                         else if ((opr2 == "<=") && (opr1 == ">="))
                         {
-                            t_msk = xt::where((q <= val2) | (q >= val1),
+                            t_msk = xt::where((q <= val2) || (q >= val1),
                                               1, t_msk);
                         }
                     }
diff --git a/include/evalhyd/detail/probabilist/evaluator.hpp b/include/evalhyd/detail/probabilist/evaluator.hpp
index ca209d062e96defcd040830041a61e2ff8b2e112..1cce16193fffc677a526f394a77a9d9e86cdf943 100644
--- a/include/evalhyd/detail/probabilist/evaluator.hpp
+++ b/include/evalhyd/detail/probabilist/evaluator.hpp
@@ -104,7 +104,7 @@ namespace evalhyd
                     );
                 }
 
-                auto msk_nan = xt::where(obs_nan | xt::row(prd_nan, 0))[0];
+                auto msk_nan = xt::where(obs_nan || xt::row(prd_nan, 0))[0];
 
                 xt::view(t_msk, xt::all(), xt::keep(msk_nan)) = false;
             };
diff --git a/include/evalhyd/detail/uncertainty.hpp b/include/evalhyd/detail/uncertainty.hpp
index 9599b441afae99b029f9f37bc95de21716131e59..8a86af59a580ad6d8ef0d768915a8d6693c1d8f6 100644
--- a/include/evalhyd/detail/uncertainty.hpp
+++ b/include/evalhyd/detail/uncertainty.hpp
@@ -90,7 +90,7 @@ namespace evalhyd
                 );
 
                 xt::xtensor<bool, 1> wdw =
-                        (x_timepoints >= start) & (x_timepoints < end);
+                        (x_timepoints >= start) && (x_timepoints < end);
 
                 // check that year is complete (without a rigorous leap year check)
                 int n_days = xt::sum(wdw)();