diff --git a/ebos/eclgenericoutputblackoilmodule.hh b/ebos/eclgenericoutputblackoilmodule.hh
index 865fbc9e1..b2e7529b1 100644
--- a/ebos/eclgenericoutputblackoilmodule.hh
+++ b/ebos/eclgenericoutputblackoilmodule.hh
@@ -135,6 +135,9 @@ public:
         return this->initialInplace_.value();
     }
 
+    // Virtual destructor for safer inheritance.
+    virtual ~EclGenericOutputBlackoilModule() = default;
+
 protected:
     using ScalarBuffer = std::vector<Scalar>;
     using StringBuffer = std::vector<std::string>;
diff --git a/ebos/eclgenericproblem.cc b/ebos/eclgenericproblem.cc
index 14aef4009..b27b07836 100644
--- a/ebos/eclgenericproblem.cc
+++ b/ebos/eclgenericproblem.cc
@@ -51,9 +51,6 @@
 
 namespace Opm {
 
-template<class GridView, class FluidSystem, class Scalar>
-std::string EclGenericProblem<GridView,FluidSystem,Scalar>::briefDescription_;
-
 template<class GridView, class FluidSystem, class Scalar>
 EclGenericProblem<GridView,FluidSystem,Scalar>::
 EclGenericProblem(const EclipseState& eclState,
diff --git a/ebos/eclgenericproblem.hh b/ebos/eclgenericproblem.hh
index 9958bde35..8ca65ec9d 100644
--- a/ebos/eclgenericproblem.hh
+++ b/ebos/eclgenericproblem.hh
@@ -251,7 +251,7 @@ protected:
     const Schedule& schedule_;
     const GridView& gridView_;
 
-    static std::string briefDescription_;
+    static inline std::string briefDescription_;
     std::array<std::vector<Scalar>, 2> referencePorosity_;
 
     std::vector<int> pvtnum_;
diff --git a/opm/simulators/wells/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
index 80985ec7d..310209488 100644
--- a/opm/simulators/wells/BlackoilWellModel_impl.hpp
+++ b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -1110,7 +1110,6 @@ namespace Opm {
 
         GasLiftStage2 glift {this->ebosSimulator_.episodeIndex(),
                              this->ebosSimulator_.vanguard().grid().comm(),
-                             this->phaseUsage(),
                              ebosSimulator_.vanguard().schedule(),
                              ebosSimulator_.vanguard().summaryState(),
                              deferred_logger, this->wellState(),
diff --git a/opm/simulators/wells/GasLiftStage2.cpp b/opm/simulators/wells/GasLiftStage2.cpp
index 6fd56379f..4c96cc812 100644
--- a/opm/simulators/wells/GasLiftStage2.cpp
+++ b/opm/simulators/wells/GasLiftStage2.cpp
@@ -40,7 +40,6 @@ namespace Opm {
 GasLiftStage2::GasLiftStage2(
     const int report_step_idx,
     const Communication& comm,
-    const PhaseUsage& phase_usage,
     const Schedule& schedule,
     const SummaryState& summary_state,
     DeferredLogger &deferred_logger,
@@ -57,7 +56,6 @@ GasLiftStage2::GasLiftStage2(
     report_step_idx_{report_step_idx},
     summary_state_{summary_state},
     schedule_{schedule},
-    phase_usage_{phase_usage},
     glo_{schedule_.glo(report_step_idx_)},
     comm_{comm},
     debug_{false}
diff --git a/opm/simulators/wells/GasLiftStage2.hpp b/opm/simulators/wells/GasLiftStage2.hpp
index 0cf5a5d31..d7f261e8b 100644
--- a/opm/simulators/wells/GasLiftStage2.hpp
+++ b/opm/simulators/wells/GasLiftStage2.hpp
@@ -67,7 +67,6 @@ class WellState;
         GasLiftStage2(
             const int report_step_idx,
             const Communication& comm,
-            const PhaseUsage& phase_usage,
             const Schedule& schedule,
             const SummaryState& summary_state,
             DeferredLogger &deferred_logger,
@@ -136,7 +135,6 @@ class WellState;
         int report_step_idx_;
         const SummaryState &summary_state_;
         const Schedule &schedule_;
-        const PhaseUsage &phase_usage_;
         const GasLiftOpt& glo_;
         const Communication &comm_;
         GradMap inc_grads_;