diff --git a/dumux/material/components/air.hh b/dumux/material/components/air.hh
index 54a0149c9b9928f2c527ec7c7be921fd99edab8b..57e1b05655e34425d91e9c0b569e00afdf552c63 100644
--- a/dumux/material/components/air.hh
+++ b/dumux/material/components/air.hh
@@ -167,7 +167,7 @@ public:
     };
 
     /*!
-     * \brief Specific enthalpy of liquid water \f$\mathrm{[J/kg]}\f$
+     * \brief Specific enthalpy of air \f$\mathrm{[J/kg]}\f$
      *        with 273.15 K as basis.
      * See:
      * W. Kays, M. Crawford, B. Weigand
diff --git a/dumux/material/fluidstates/compositionalfluidstate.hh b/dumux/material/fluidstates/compositionalfluidstate.hh
index 03ff8e62d110bff6de59ae218d8ba37ddf6b27f8..101e1603097bb63f72164d9c326c618d28416396 100644
--- a/dumux/material/fluidstates/compositionalfluidstate.hh
+++ b/dumux/material/fluidstates/compositionalfluidstate.hh
@@ -296,7 +296,7 @@ public:
     { density_[phaseIdx] = value; }
 
     /*!
-     * \brief Set the specific enthalpy of a phase [J/m^3]
+     * \brief Set the specific enthalpy of a phase [J/kg]
      */
     void setEnthalpy(int phaseIdx, Scalar value)
     { enthalpy_[phaseIdx] = value; }
@@ -327,7 +327,7 @@ public:
             Valgrind::CheckDefined(pressure_[phaseIdx]);
             Valgrind::CheckDefined(saturation_[phaseIdx]);
             Valgrind::CheckDefined(density_[phaseIdx]);
-            //Valgrind::CheckDefined(enthalpy_[phaseIdx]);
+            Valgrind::CheckDefined(enthalpy_[phaseIdx]);
             Valgrind::CheckDefined(viscosity_[phaseIdx]);
         }
 
diff --git a/dumux/material/fluidsystems/h2oairfluidsystem.hh b/dumux/material/fluidsystems/h2oairfluidsystem.hh
index fad18229396f57de0512c0a2f58b9fda150804c5..7a231c40da4670011be9917273646fcf0fa9d2b9 100644
--- a/dumux/material/fluidsystems/h2oairfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairfluidsystem.hh
@@ -660,8 +660,8 @@ public:
                                     int phaseIdx,
                                     int componentIdx)
     {
-        Scalar T = fluidState.temperature(nPhaseIdx);
-        Scalar p = fluidState.pressure(nPhaseIdx);
+        Scalar T = fluidState.temperature(phaseIdx);
+        Scalar p = fluidState.pressure(phaseIdx);
         Valgrind::CheckDefined(T);
         Valgrind::CheckDefined(p);
 
@@ -671,7 +671,7 @@ public:
         }
         else if (phaseIdx == nPhaseIdx)
         {
-            if (componentIdx ==  H2OIdx)
+            if (componentIdx == H2OIdx)
             {
                 return H2O::gasEnthalpy(T, p);
             }