diff --git a/opm/autodiff/BlackoilModelBase_impl.hpp b/opm/autodiff/BlackoilModelBase_impl.hpp
index 36627f20d..1c8daf1a9 100644
--- a/opm/autodiff/BlackoilModelBase_impl.hpp
+++ b/opm/autodiff/BlackoilModelBase_impl.hpp
@@ -775,7 +775,7 @@ namespace detail {
         asImpl().assembleMassBalanceEq(state);
 
         // -------- Well equations ----------
-        IterationReport iter_report = {false, false, 0, std::numeric_limits<int>::min()};
+        IterationReport iter_report = {false, false, 0, 0};
         if ( ! wellsActive() ) {
             return iter_report;
         }
diff --git a/opm/autodiff/BlackoilMultiSegmentModel_impl.hpp b/opm/autodiff/BlackoilMultiSegmentModel_impl.hpp
index cef4df44f..0fc98776b 100644
--- a/opm/autodiff/BlackoilMultiSegmentModel_impl.hpp
+++ b/opm/autodiff/BlackoilMultiSegmentModel_impl.hpp
@@ -182,7 +182,7 @@ namespace Opm {
         asImpl().assembleMassBalanceEq(state);
 
         // -------- Well equations ----------
-        IterationReport iter_report = {false, false, 0, std::numeric_limits<int>::min()};
+        IterationReport iter_report = {false, false, 0, 0};
         if ( ! wellsActive() ) {
             return iter_report;
         }
diff --git a/opm/autodiff/BlackoilTransportModel.hpp b/opm/autodiff/BlackoilTransportModel.hpp
index 7351cce5f..38af2ecac 100644
--- a/opm/autodiff/BlackoilTransportModel.hpp
+++ b/opm/autodiff/BlackoilTransportModel.hpp
@@ -124,7 +124,7 @@ namespace Opm {
             asImpl().assembleMassBalanceEq(state);
 
             // -------- Well equations ----------
-            IterationReport iter_report = {false, false, 0, std::numeric_limits<int>::min()};
+            IterationReport iter_report = {false, false, 0, 0};
             if ( ! wellsActive() ) {
                 return iter_report;
             }
diff --git a/opm/autodiff/NonlinearSolver.hpp b/opm/autodiff/NonlinearSolver.hpp
index c69e58725..fdc80ada6 100644
--- a/opm/autodiff/NonlinearSolver.hpp
+++ b/opm/autodiff/NonlinearSolver.hpp
@@ -117,7 +117,7 @@ namespace Opm {
         /// Number of linear solver iterations used in the last call to step().
         int linearIterationsLastStep() const;
 
-        /// Number of well iterations used in the last call to step().
+        /// Number of well iterations used in all calls to step().
         int wellIterationsLastStep() const;
 
         /// Reference to physical model.
diff --git a/opm/autodiff/NonlinearSolver_impl.hpp b/opm/autodiff/NonlinearSolver_impl.hpp
index 00a34e3cb..0ed45cce2 100644
--- a/opm/autodiff/NonlinearSolver_impl.hpp
+++ b/opm/autodiff/NonlinearSolver_impl.hpp
@@ -92,7 +92,6 @@ namespace Opm
         return wellIterationsLast_;
     }
 
-
     template <class PhysicalModel>
     int
     NonlinearSolver<PhysicalModel>::
@@ -150,7 +149,7 @@ namespace Opm
 
         linearIterations_ += linIters;
         nonlinearIterations_ += iteration - 1; // Since the last one will always be trivial.
-        wellIterations_ += wellIters; 
+        wellIterations_ += wellIters;
         linearIterationsLast_ = linIters;
         nonlinearIterationsLast_ = iteration;
         wellIterationsLast_ = wellIters;
diff --git a/opm/autodiff/SimulatorBase_impl.hpp b/opm/autodiff/SimulatorBase_impl.hpp
index 62074387b..17b974278 100644
--- a/opm/autodiff/SimulatorBase_impl.hpp
+++ b/opm/autodiff/SimulatorBase_impl.hpp
@@ -213,7 +213,7 @@ namespace Opm
                 {
                     std::ostringstream iter_msg;
                     iter_msg << "Stepsize " << (double)unit::convert::to(timer.currentStepLength(), unit::day);
-                    if (solver->wellIterations() != std::numeric_limits<int>::min()) {
+                    if (solver->wellIterations() != 0) {
                         iter_msg << " days well iterations = " << solver->wellIterations() << ", ";
                     }
                     iter_msg << "non-linear iterations = " << solver->nonlinearIterations()