diff --git a/dumux/common/dimensionlessnumbers.hh b/dumux/common/dimensionlessnumbers.hh
index 3b3c7201c704842146e1349cce647e891f096ddb..786fdc990e13ef5643d1c9861ff5f629a4ebd630 100644
--- a/dumux/common/dimensionlessnumbers.hh
+++ b/dumux/common/dimensionlessnumbers.hh
@@ -263,15 +263,17 @@ static Scalar sherwoodNumber(const Scalar reynoldsNumber,
 
     else {
         DUNE_THROW(Dune::NotImplemented, "wrong index");
-    }}
+    }
+}
 
 
 /*!
  * \brief   Calculate the thermal diffusivity alpha [m^2/s].
  *
  *          The thermal diffusivity is a measure for how fast "temperature (not heat!) spreads".
- *          It is defined as \alpha = k / (rho c_p)
- *          with \alpha: k: thermal conductivity [W/mK], rho: density [kg/m^3], c_p: cpecific heat capacity at constant pressure [J/kgK].
+ *          It is defined as \f$\alpha = \frac{k}{\rho c_p}\f$
+ *          with \f$\alpha\f$: \f$k\f$: thermal conductivity [W/mK], \f$\rho\f$: density [kg/m^3],
+ *          \f$c_p\f$: cpecific heat capacity at constant pressure [J/kgK].
  *
  *          Source for thermal diffusivity definition: http://en.wikipedia.org/wiki/Thermal_diffusivity
  *
diff --git a/test/common/generalproblem/generallensproblem.hh b/test/common/generalproblem/generallensproblem.hh
index 549cb1b93519fdc0deb7a890da353f0557b18c7d..5d2935fff9621d88475ebf4702978c8518a6305b 100644
--- a/test/common/generalproblem/generallensproblem.hh
+++ b/test/common/generalproblem/generallensproblem.hh
@@ -146,7 +146,7 @@ SET_SCALAR_PROP(DecoupledGeneralLensProblem, ImpetCFLFactor, 0.95);
 }
 
 /*!
- * \ingroup TwoPBoxModel
+ * \ingroup TwoPModel
  * \ingroup IMPETtests
  *
  * \brief Soil contamination problem where DNAPL infiltrates a fully
diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
index 4da8293b12ee99cca169b73b0c19e47c1933d3d8..96372d88f4d850cc6112ed103f7bcb712c7f7c4f 100644
--- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
@@ -679,8 +679,10 @@ public:
      *
      * The phaseIdx and transportCompIdx1 are predefined
      *
+     * \todo boundaryVars1 violates naming convention
+     *
      * \param elemVolVars1 All volume variables for the element
-     * \param boundaryVars1 Flux variables (\todo violates naming convention)
+     * \param boundaryVars1 Flux variables
      * \param vertInElem1 Vertex index for the inside element
      */
     Scalar computeAdvectiveVaporFluxes1(const ElementVolumeVariables1& elemVolVars1,
@@ -698,8 +700,10 @@ public:
      *
      * The transportCompIdx1 is predefined
      *
+     * \todo boundaryVars1 violates naming convention
+     *
      * \param elemVolVars1 All volume variables for the element
-     * \param boundaryVars1 Flux variables (\todo violates naming convention)
+     * \param boundaryVars1 Flux variables
      * \param vertInElem1 Vertex index for the inside elements
      */
     Scalar computeDiffusiveVaporFluxes1(const ElementVolumeVariables1& elemVolVars1,
diff --git a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
index c8f72b56f2eaf0279139351addb4d79c7b4fa16c..4d772911abe4ea9f3e5b91d847f1a452df8f6b97 100644
--- a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
+++ b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
@@ -649,8 +649,10 @@ public:
      *
      * The phaseIdx and transportCompIdx1 are predefined
      *
+     * \todo boundaryVars1 violates naming convention
+     *
      * \param elemVolVars1 All volume variables for the element
-     * \param boundaryVars1 Flux variables (\todo violates naming convention)
+     * \param boundaryVars1 Flux variables
      * \param vertInElem1 Vertex index for the inside element
      */
     Scalar computeAdvectiveVaporFluxes1(const ElementVolumeVariables1& elemVolVars1,
@@ -668,8 +670,10 @@ public:
      *
      * The transportCompIdx1 is predefined
      *
+     * \todo boundaryVars1 violates naming convention
+     *
      * \param elemVolVars1 All volume variables for the element
-     * \param boundaryVars1 Flux variables (\todo violates naming convention)
+     * \param boundaryVars1 Flux variables
      * \param vertInElem1 Vertex index for the inside elements
      */
     Scalar computeDiffusiveVaporFluxes1(const ElementVolumeVariables1& elemVolVars1,