diff --git a/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp b/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
index 2a9bddff5..db632f007 100644
--- a/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
+++ b/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
@@ -294,11 +294,11 @@ public:
     template <class ContainerT, class FluidState>
     static void dCapillaryPressures_dSaturation(ContainerT &values,
                                                 const Params &params,
-                                                const FluidState &state,
+                                                const FluidState &fluidState,
                                                 int satPhaseIdx)
     {
         OPM_THROW(std::logic_error,
-                  "Not implemented: dCapillaryPressures_dSaturation()");
+                  "Not implemented: dCapillaryPressure_dSaturation()");
     }
 
     /*!
diff --git a/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp b/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp
index d3be5bf7a..2aeab5fd5 100644
--- a/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp
+++ b/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp
@@ -85,7 +85,7 @@ public:
     { assertFinalized_(); return oilWaterParams_; }
 
     /*!
-     * \brief The parameter object for the oil-water twophase law.
+     * \brief Set the parameter object for the oil-water twophase law.
      */
     void setOilWaterParams(const OilWaterParams& val)
     { oilWaterParams_ = val; }
diff --git a/opm/material/fluidsystems/BlackOilFluidSystem.hpp b/opm/material/fluidsystems/BlackOilFluidSystem.hpp
index d7206385b..87d70c08e 100644
--- a/opm/material/fluidsystems/BlackOilFluidSystem.hpp
+++ b/opm/material/fluidsystems/BlackOilFluidSystem.hpp
@@ -88,10 +88,12 @@ public:
      */
     static void init()
     {
-        OPM_THROW(std::logic_error, "No generic init() method for this fluid system. The black-oil fluid system must be initialized with:\n"
-                   << "    FluidSystem::initBegin()\n"
-                   << "    // set black oil parameters\n"
-                   << "    FluidSystem::initEnd()\n");
+        OPM_THROW(std::logic_error,
+                  "There is no generic init() method for this fluid system. The "
+                  << "black-oil fluid system must be initialized using:\n"
+                  << "    FluidSystem::initBegin()\n"
+                  << "    // set black oil parameters\n"
+                  << "    FluidSystem::initEnd()\n");
     }
 
     /*!