diff --git a/dumux/decoupled/2p2c/2p2cproblem.hh b/dumux/decoupled/2p2c/2p2cproblem.hh
index d8a48442ac294d5f4024655785b61cba1c17543f..5ab3a9203acf43ca3f824c8dda8ccfdf4766589d 100644
--- a/dumux/decoupled/2p2c/2p2cproblem.hh
+++ b/dumux/decoupled/2p2c/2p2cproblem.hh
@@ -140,6 +140,7 @@ public:
 
     //! Concentration initial condition (dimensionless)
     /*! The problem is initialized with the following concentration.
+     * \param element The element.
      */
     Scalar initConcentration(const Element& element) const
     {
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index 2cf62fd349cc434ba811f581b35e610d8bb068a3..2d71c181d26fd0e1ad3a4600e4ec5dcec72210ad 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -1101,12 +1101,12 @@ void FVPressure2P2C<TypeTag>::initialMaterialLaws(bool compositional)
 			problem().variables().capillaryPressure(globalIdx) = 0.;
 			if (icFormulation == Indices::BoundaryFormulation::saturation)  // saturation initial condition
 			{
-				sat_0 = problem().initSat(globalPos, *eIt);
+				sat_0 = problem().initSat(*eIt);
 				fluidState.satFlash(sat_0, pressure, problem().spatialParameters().porosity(globalPos, *eIt), temperature_);
 			}
 			else if (icFormulation == Indices::BoundaryFormulation::concentration) // concentration initial condition
 			{
-				Scalar Z1_0 = problem().initConcentration(globalPos, *eIt);
+				Scalar Z1_0 = problem().initConcentration(*eIt);
 				fluidState.update(Z1_0, pressure, problem().spatialParameters().porosity(globalPos, *eIt), temperature_);
 			}
         }
@@ -1115,7 +1115,7 @@ void FVPressure2P2C<TypeTag>::initialMaterialLaws(bool compositional)
 			if (icFormulation == Indices::BoundaryFormulation::saturation)  // saturation initial condition
 			{
 			    //get saturation, determine pc
-				sat_0 = problem().initSat(globalPos, *eIt);
+				sat_0 = problem().initSat(*eIt);
 		        if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
 		        {
                     problem().variables().capillaryPressure(globalIdx)
@@ -1146,7 +1146,7 @@ void FVPressure2P2C<TypeTag>::initialMaterialLaws(bool compositional)
 			}
 			else if (icFormulation == Indices::BoundaryFormulation::concentration) // concentration initial condition
 			{
-				Scalar Z1_0 = problem().initConcentration(globalPos, *eIt);
+				Scalar Z1_0 = problem().initConcentration(*eIt);
 				// If total concentrations are given at the boundary, saturation is unknown.
 				// This may affect pc and hence p_alpha and hence again saturation -> iteration.
 
@@ -1200,7 +1200,6 @@ void FVPressure2P2C<TypeTag>::initialMaterialLaws(bool compositional)
 		            pressure[wPhaseIdx] = pressure[nPhaseIdx]
 		                = problem().variables().pressure()[globalIdx];
 		            fluidState.update(Z1_0, pressure, problem().spatialParameters().porosity(globalPos, *eIt), temperature_);
-
 		        }
 			} //end conc initial condition
         } //end compositional
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index a424a12f6e2562f0598d9a258c11220d49e24b18..fcfd85be8f16bce2d6622299ae3a2e54dedafbf3 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -129,7 +129,7 @@ public:
         problem_(problem), switchNormals(false)
     {  }
 
-    ~FVTransport2P2C()
+    virtual ~FVTransport2P2C()
     {
     }
 
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index b825d30697578424594d3809e8ee14d959bf827c..ee06843980cfa7be9806c7a881beba58a195efab 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -109,9 +109,8 @@ public:
         problem_(problem), switchNormals(false)
     {}
 
-    ~FVTransport2P2CMultiPhysics()
-    {
-    }
+    virtual ~FVTransport2P2CMultiPhysics()
+    {     }
 
 protected:
     Problem& problem_;