diff --git a/ebos/eclgenericvanguard.cc b/ebos/eclgenericvanguard.cc
index 4053ddd35..a2700e495 100644
--- a/ebos/eclgenericvanguard.cc
+++ b/ebos/eclgenericvanguard.cc
@@ -53,13 +53,13 @@
 namespace Opm {
 
 double EclGenericVanguard::externalSetupTime_ = 0.0;
-std::unique_ptr<ParseContext> EclGenericVanguard::externalParseContext_ = nullptr;
-std::unique_ptr<ErrorGuard> EclGenericVanguard::externalErrorGuard_ = nullptr;
+std::unique_ptr<ParseContext> EclGenericVanguard::externalParseContext_;
+std::unique_ptr<ErrorGuard> EclGenericVanguard::externalErrorGuard_;
 std::unique_ptr<Deck> EclGenericVanguard::externalDeck_;
 bool EclGenericVanguard::externalDeckSet_ = false;
 std::unique_ptr<EclipseState> EclGenericVanguard::externalEclState_;
-std::unique_ptr<Schedule> EclGenericVanguard::externalEclSchedule_ = nullptr;
-std::unique_ptr<SummaryConfig> EclGenericVanguard::externalEclSummaryConfig_ = nullptr;
+std::unique_ptr<Schedule> EclGenericVanguard::externalEclSchedule_;
+std::unique_ptr<SummaryConfig> EclGenericVanguard::externalEclSummaryConfig_;
 
 EclGenericVanguard::EclGenericVanguard()
     : python(std::make_shared<Python>())
diff --git a/ebos/eclgenericvanguard.hh b/ebos/eclgenericvanguard.hh
index 379a9ef02..eebc694c6 100644
--- a/ebos/eclgenericvanguard.hh
+++ b/ebos/eclgenericvanguard.hh
@@ -256,7 +256,7 @@ public:
      *
      * Will only have usable values for CpGrid.
      */
-    const std::vector<std::pair<std::string,bool>>& parallelWells() const
+    const ParallelWellStruct& parallelWells() const
     { return parallelWells_; }
 
 protected: