diff --git a/corsika/modules/epos/Interaction.hpp b/corsika/modules/epos/Interaction.hpp
index 0a9552a6dda606738a8ee8b9d066680116d23b5a..69d5a7186ec2f289f23ddb726f071ac3979c751b 100644
--- a/corsika/modules/epos/Interaction.hpp
+++ b/corsika/modules/epos/Interaction.hpp
@@ -73,7 +73,7 @@ namespace corsika::epos {
     void setParticlesStable() const;
 
   private:
-    default_prng_type& RNG_ = RNGManager::getInstance().getRandomStream("epos");
+    default_prng_type& RNG_ = RNGManager<>::getInstance().getRandomStream("epos");
     std::shared_ptr<spdlog::logger> logger_ = get_logger("corsika_epos_Interaction");
     HEPEnergyType const minEnergyCoM_ = 6 * 1e9 * electronvolt;
     HEPEnergyType const maxEnergyCoM_ = 2.e6 * 1e9 * electronvolt;
diff --git a/corsika/modules/epos/Random.hpp b/corsika/modules/epos/Random.hpp
index 4f0099ac3a9e033d9573a9aade1dac3fb9ea4a9b..19fb676ac92a641f0d8f6e1afa1d465885fab3f1 100644
--- a/corsika/modules/epos/Random.hpp
+++ b/corsika/modules/epos/Random.hpp
@@ -23,14 +23,14 @@ namespace epos {
 
   float rndm_interface() {
     static corsika::default_prng_type& rng =
-        corsika::RNGManager::getInstance().getRandomStream("epos");
+        corsika::RNGManager<>::getInstance().getRandomStream("epos");
     std::uniform_real_distribution<float> dist;
     return dist(rng);
   }
 
   double double_rndm_interface() {
     static corsika::default_prng_type& rng =
-        corsika::RNGManager::getInstance().getRandomStream("epos");
+        corsika::RNGManager<>::getInstance().getRandomStream("epos");
     std::uniform_real_distribution<double> dist;
     return dist(rng);
   }
diff --git a/tests/framework/testGeometry.cpp b/tests/framework/testGeometry.cpp
index cd2d8dbd2a2047d7218379bfb973e008a355d170..7d39abccb0db3e54506b24b34525a1f8e599d42a 100644
--- a/tests/framework/testGeometry.cpp
+++ b/tests/framework/testGeometry.cpp
@@ -298,7 +298,7 @@ TEST_CASE("Geometry Trajectories") {
     CHECK(base.getDuration() / 1_s == Approx(10));
 
     StraightTrajectory base2(line,
-                             std::numeric_limits<TimeType::value_type>::infinity() * 1_);
+                             std::numeric_limits<TimeType::value_type>::infinity() * 1_s);
     base2.setDuration(10_s);
     CHECK(base2.getDuration() / 1_s == Approx(10));
   }
diff --git a/tests/modules/testEpos.cpp b/tests/modules/testEpos.cpp
index 66dba6031bb67ff3fcdb3cc09bc19985400b049f..5bb27e0e06fddfe2c6bfa85e703befeb848c1d5c 100644
--- a/tests/modules/testEpos.cpp
+++ b/tests/modules/testEpos.cpp
@@ -127,7 +127,7 @@ TEST_CASE("EposInterface", "[processes]") {
   auto const& cs = *csPtr;
   [[maybe_unused]] auto const& env_dummy = env;
 
-  RNGManager::getInstance().registerRandomStream("epos");
+  RNGManager<>::getInstance().registerRandomStream("epos");
 
   SECTION("InteractionInterface - random number") {
     auto const rndm = ::epos::rangen_();
@@ -166,18 +166,21 @@ TEST_CASE("EposInterface", "[processes]") {
         model.getCrossSectionLab(Code::Proton, 1, 1, Code::Proton, 1, 1,
                                  sqs2elab(7_TeV, Proton::mass, Proton::mass));
     CHECK(xs_prod / 1_mb == Approx(70.7).margin(2.1));
+    { [[maybe_unused]] auto const& dum_xs = xs_ela; }
 
     // pi-n at 7TeV
     auto const [xs_prod1, xs_ela1] =
         model.getCrossSectionLab(Code::PiPlus, 0, 0, Code::Neutron, 1, 0,
                                  sqs2elab(7_TeV, PiPlus::mass, Neutron::mass));
     CHECK(xs_prod1 / 1_mb == Approx(52.7).margin(2.1));
+    { [[maybe_unused]] auto const& dum_xs = xs_ela1; }
 
     // k-p at 7TeV
     auto const [xs_prod2, xs_ela2] =
         model.getCrossSectionLab(Code::KPlus, 0, 0, Code::Proton, 1, 1,
                                  sqs2elab(7_TeV, KPlus::mass, Proton::mass));
     CHECK(xs_prod2 / 1_mb == Approx(45.7).margin(2.1));
+    { [[maybe_unused]] auto const& dum_xs = xs_ela2; }
   }
 
   SECTION("InteractionInterface - nuclear cross sections") {
@@ -187,17 +190,20 @@ TEST_CASE("EposInterface", "[processes]") {
     auto const [xs_prod, xs_ela] = model.getCrossSectionLab(
         Code::Proton, 1, 1, Code::Oxygen, Oxygen::nucleus_A, Oxygen::nucleus_Z, 100_GeV);
     CHECK(xs_prod / 1_mb == Approx(287.0).margin(5.1));
+    { [[maybe_unused]] auto const& dum_xs = xs_ela; }
 
     auto const [xs_prod2, xs_ela2] = model.getCrossSectionLab(
         Code::Nitrogen, Nitrogen::nucleus_A, Nitrogen::nucleus_Z, Code::Oxygen,
         Oxygen::nucleus_A, Oxygen::nucleus_Z, 400_GeV);
     CHECK(xs_prod2 / 1_mb == Approx(1076.7).margin(3.1));
+    { [[maybe_unused]] auto const& dum_xs = xs_ela2; }
 
     // nuclear stack extension, particle "Nucleus"
     auto const [xs_prod3, xs_ela3] = model.getCrossSectionLab(
         Code::Nucleus, Nitrogen::nucleus_A, Nitrogen::nucleus_Z, Code::Oxygen,
         Oxygen::nucleus_A, Oxygen::nucleus_Z, 400_GeV);
     CHECK(xs_prod2 / xs_prod3 == 1);
+    { [[maybe_unused]] auto const& dum_xs = xs_ela3; }
   }
 
   SECTION("InteractionInterface - low energy") {