diff --git a/doc/doxygen/Doxylocal b/doc/doxygen/Doxylocal
index 02651e7aa218051633e52ecda511adecf8cbf15f..ce65b36179d863d707d016bcd27185d9795179ef 100644
--- a/doc/doxygen/Doxylocal
+++ b/doc/doxygen/Doxylocal
@@ -19,6 +19,8 @@ IMAGE_PATH             = @srcdir@/images
 
 EXTRA_PACKAGES        += amsmath,amssymb,units
 
+ALIASES += "warning=\xrefitem warning \"Warning List\" \"Warning List\""
+
 # enable client side searching
 SEARCHENGINE           = YES
 SERVER_BASED_SEARCH    = NO
diff --git a/dumux/material/binarycoefficients/brine_air.hh b/dumux/material/binarycoefficients/brine_air.hh
index 72ab50ecc4354a78f1c98b75aa91a22889813055..53521c7496f21dc8dccc486668dc4ffb2f63a090 100644
--- a/dumux/material/binarycoefficients/brine_air.hh
+++ b/dumux/material/binarycoefficients/brine_air.hh
@@ -397,6 +397,7 @@ public:
      * \brief Returns the _mole_ (!) fraction of Air in the liquid
      *        phase at a given temperature, pressure and density of
      *        Air.
+     *
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
      * \param rhoAir density of Air
@@ -529,17 +530,17 @@ private:
     /*!
      * \brief computation of partial pressure Air
      *
+     * We assume that the partial pressure of brine is its vapor pressure.
+     * \warning: Strictly this is assumption is invalid for air because the
+     *           mole fraction of air in brine can be considerable
+     *
      * \param temperature the temperature [K]
      * \param pg the gas phase pressure [Pa]
      */
     static Scalar partialPressureAir_(Scalar temperature, Scalar pg)
     {
-        // We assume that the partial pressure of brine is its vapor
-        // pressure. TODO: Strictly this is assumption is invalid for
-        // Air because the mole fraction of Air in brine can be
-        // considerable
         return pg - Brine::vaporPressure(temperature);
-    };
+    }
 
     /*!
      * \brief The fugacity coefficent of Air for a Air-H2O mixture.
diff --git a/dumux/material/binarycoefficients/brine_co2.hh b/dumux/material/binarycoefficients/brine_co2.hh
index a402b55520951225a25bda8d2cfe2a7a1d0eb6d4..ba3abc68815ce4afb26de98adafb85a02ed4cd71 100644
--- a/dumux/material/binarycoefficients/brine_co2.hh
+++ b/dumux/material/binarycoefficients/brine_co2.hh
@@ -510,15 +510,15 @@ private:
     /*!
      * \brief computation of partial pressure CO2
      *
+     * We assume that the partial pressure of brine is its vapor pressure.
+     * \warning: Strictly this is assumption is invalid for CO2 because the
+     *           mole fraction of CO2 in brine can be considerable
+     *
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
      */
     static Scalar partialPressureCO2_(Scalar temperature, Scalar pg)
     {
-        // We assume that the partial pressure of brine is its vapor
-        // pressure. TODO: Strictly this is assumption is invalid for
-        // CO2 because the mole fraction of CO2 in brine can be
-        // considerable
         return pg - Brine::vaporPressure(temperature);
     }
 
diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index 137bce6391c9ddd67d570d07aa8d45474f29b2c6..13bb98be6719081f30be2dfd85fb330fba18a249 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -697,9 +697,10 @@ private:
     /*!
      * \brief The density of pure brine at a given pressure and temperature \f$\mathrm{[kg/m^3]}\f$.
      *
+     * \warning The influence of dissolved air in Brine is neglected
+     *
      * \param temperature temperature of component in \f$\mathrm{[K]}\f$
      * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
-     *
      * Equations given in:
      *                        - Batzle & Wang (1992) \cite batzle1992 <BR>
      *                        - cited by: Adams & Bachu in Geofluids (2002) 2, 257-271 \cite adams2002
@@ -726,8 +727,7 @@ private:
                        "Liquid density for Brine and Air is only "
                        "defined below 100MPa (is " << pl << ")");
         }
-        Scalar rho_brine = Brine::liquidDensity(T, pl, XlNaCl); // WARNING: Here we just neglect the influence of dissolved air in Brine
-        return rho_brine;
+        return Brine::liquidDensity(T, pl, XlNaCl); // The influence of dissolved air in Brine is neglected
     }
 
     static Scalar liquidEnthalpyBrine_(Scalar T,