diff --git a/opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp b/opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp
index b4a5e9a7d..651d08d88 100644
--- a/opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp
+++ b/opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp
@@ -675,9 +675,8 @@ namespace Opm {
             assert(growthFactor_ >= 1.0);
         }
 
-
-        template <class StepReportVector>
-        std::set<std::string> consistentlyFailingWells(const StepReportVector& sr)
+        template <class ProblemType>
+        std::set<std::string> consistentlyFailingWells(const std::vector<ProblemType>& sr)
         {
             // If there are wells that cause repeated failures, we
             // close them, and restart the un-chopped timestep.
diff --git a/opm/simulators/wells/WellInterface_impl.hpp b/opm/simulators/wells/WellInterface_impl.hpp
index 4f7ff1040..1860479fb 100644
--- a/opm/simulators/wells/WellInterface_impl.hpp
+++ b/opm/simulators/wells/WellInterface_impl.hpp
@@ -257,7 +257,7 @@ namespace Opm
         // individually. We first open all completions, then we close one by one by calling updateWellTestState
         // untill the number of closed completions do not increase anymore.
         while (testWell) {
-            const size_t original_number_closed_completions = welltest_state_temp.sizeCompletions();
+            const size_t original_number_closed_completions = welltest_state_temp.num_closed_completions();
             bool converged = solveWellForTesting(simulator, well_state_copy, group_state, deferred_logger);
             if (!converged) {
                 const auto msg = fmt::format("WTEST: Well {} is not solvable (physical)", this->name());
@@ -291,8 +291,8 @@ namespace Opm
             // Also check if number of completions has increased. If the number of closed completions do not increased
             // we stop the testing.
             // TODO: it can be tricky here, if the well is shut/closed due to other reasons
-            if ( welltest_state_temp.sizeWells() > 0 ||
-                (original_number_closed_completions == welltest_state_temp.sizeCompletions()) ) {
+            if ( welltest_state_temp.num_closed_wells() > 0 ||
+                (original_number_closed_completions == welltest_state_temp.num_closed_completions()) ) {
                     testWell = false; // this terminates the while loop
             }
         }