diff --git a/include/evalhyd/evald.hpp b/include/evalhyd/evald.hpp
index 34a879f00cdd235fd14f78297e70ee4bec84a0fe..45ff6591af894998e42063bf2a6b534db476f237 100644
--- a/include/evalhyd/evald.hpp
+++ b/include/evalhyd/evald.hpp
@@ -4,7 +4,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <xtensor/xexpression.hpp>
+#include <xtensor/xtensor.hpp>
 #include <xtensor/xarray.hpp>
 
 
diff --git a/src/determinist/evald.cpp b/src/determinist/evald.cpp
index 92dfbc194e96ae8512965c1323c7d17f241c62c6..67355301ed0e6aac252800ab1aeea550ba266412 100644
--- a/src/determinist/evald.cpp
+++ b/src/determinist/evald.cpp
@@ -22,14 +22,13 @@ namespace evalhyd
             const xt::xtensor<double, 2>& q_obs,
             const xt::xtensor<double, 2>& q_prd,
             const std::vector<std::string>& metrics,
-            const std::string& transform = "none",
-            const double exponent = 1,
-            double epsilon = -9,
-            const xt::xtensor<bool, 2>& t_msk = {},
-            const xt::xtensor<std::array<char, 32>, 1>& m_cdt = {},
-            const std::unordered_map<std::string, int>& bootstrap =
-                    {{"n_samples", -9}, {"len_sample", -9}, {"summary", 0}},
-            const std::vector<std::string>& dts = {}
+            const std::string& transform,
+            const double exponent,
+            double epsilon,
+            const xt::xtensor<bool, 2>& t_msk,
+            const xt::xtensor<std::array<char, 32>, 1>& m_cdt,
+            const std::unordered_map<std::string, int>& bootstrap,
+            const std::vector<std::string>& dts
     )
     {
         // check that the metrics to be computed are valid
diff --git a/src/probabilist/evalp.cpp b/src/probabilist/evalp.cpp
index ee6c64d2eea6972fb8330972fec511bf50d078da..3e0ae7f6bec29e0cbda50c3e183db2b552ff04ce 100644
--- a/src/probabilist/evalp.cpp
+++ b/src/probabilist/evalp.cpp
@@ -22,12 +22,11 @@ namespace evalhyd
             const xt::xtensor<double, 2>& q_obs,
             const xt::xtensor<double, 4>& q_prd,
             const std::vector<std::string>& metrics,
-            const xt::xtensor<double, 2>& q_thr = {},
-            const xt::xtensor<bool, 4>& t_msk = {},
-            const xt::xtensor<std::array<char, 32>, 2>& m_cdt = {},
-            const std::unordered_map<std::string, int>& bootstrap =
-                    {{"n_samples", -9}, {"len_sample", -9}, {"summary", 0}},
-            const std::vector<std::string>& dts = {}
+            const xt::xtensor<double, 2>& q_thr,
+            const xt::xtensor<bool, 4>& t_msk,
+            const xt::xtensor<std::array<char, 32>, 2>& m_cdt,
+            const std::unordered_map<std::string, int>& bootstrap,
+            const std::vector<std::string>& dts
     )
     {
         // check that the metrics to be computed are valid
diff --git a/src/probabilist/evaluator_brier.cpp b/src/probabilist/evaluator_brier.cpp
index bbadf845336f9ca2acaee93cc68b0ebac9965d0a..2528aef8fb811add2845b19bc1bb5709081c9c10 100644
--- a/src/probabilist/evaluator_brier.cpp
+++ b/src/probabilist/evaluator_brier.cpp
@@ -3,7 +3,7 @@
 #include <xtensor/xmasked_view.hpp>
 #include <xtensor/xoperation.hpp>
 
-#include "evaluator.h"
+#include "probabilist/evaluator.hpp"
 
 namespace eh = evalhyd;
 
diff --git a/src/probabilist/evaluator_elements.cpp b/src/probabilist/evaluator_elements.cpp
index e09b17987d408f61f766f8cca7baec2eacc3e89e..bdce6c1b729a600343ac2bea710caea604a7658c 100644
--- a/src/probabilist/evaluator_elements.cpp
+++ b/src/probabilist/evaluator_elements.cpp
@@ -2,7 +2,7 @@
 #include <xtensor/xview.hpp>
 #include <xtensor/xsort.hpp>
 
-#include "evaluator.h"
+#include "probabilist/evaluator.hpp"
 
 namespace evalhyd
 {
diff --git a/src/probabilist/evaluator_quantiles.cpp b/src/probabilist/evaluator_quantiles.cpp
index bd580e7fe0582c761a108c152ab54cc8297c73b3..c6f37e23a716251c046fe35d3c11e7c5a6b46f73 100644
--- a/src/probabilist/evaluator_quantiles.cpp
+++ b/src/probabilist/evaluator_quantiles.cpp
@@ -3,7 +3,7 @@
 #include <xtensor/xview.hpp>
 #include <xtensor/xoperation.hpp>
 
-#include "evaluator.h"
+#include "probabilist/evaluator.hpp"
 
 namespace eh = evalhyd;