diff --git a/dumux/material/components/air.hh b/dumux/material/components/air.hh
index 196b3a207ebc14d1853dbcde02b9be811c7df0ff..2e803f910b9b8f25ef98bee501b98a12c7461487 100644
--- a/dumux/material/components/air.hh
+++ b/dumux/material/components/air.hh
@@ -58,7 +58,7 @@ public:
      *
      * Taken from constrelair.hh.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     { return 0.02896; /* [kg/mol] */ }
 
     /*!
@@ -99,13 +99,13 @@ public:
     /*!
      * \brief Returns true, the gas phase is assumed to be compressible
      */
-    static bool gasIsCompressible()
+    static constexpr bool gasIsCompressible()
     { return true; }
 
     /*!
      * \brief Returns true, the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return true; }
 
     /*!
diff --git a/dumux/material/components/benzene.hh b/dumux/material/components/benzene.hh
index d08f1b6388598e3c221f093d1651f806bdcae8ca..9b970ce2678a7767528336a2586b6c9131f669dd 100644
--- a/dumux/material/components/benzene.hh
+++ b/dumux/material/components/benzene.hh
@@ -56,7 +56,7 @@ public:
     /*!
      * \brief The molar mass in \f$\mathrm{[kg/mol]}\f$ of benzene
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     { return 0.07811; }
 
     /*!
diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh
index 422bee5dae03103d7293875bd0d4d94dd6511ee2..d970314211dac4d5b6fd2da1a674ef1e6a29b239 100644
--- a/dumux/material/components/brine.hh
+++ b/dumux/material/components/brine.hh
@@ -71,7 +71,7 @@ public:
      *\param salinity The mass fraction of salt in brine
      * This assumes that the salt is pure NaCl.
      */
-   static Scalar molarMass(Scalar salinity = constantSalinity)
+   static constexpr Scalar molarMass(Scalar salinity = constantSalinity)
    {
        const Scalar M1 = H2O::molarMass();
        const Scalar M2 = Components::NaCl<Scalar>::molarMass(); // molar mass of NaCl [kg/mol]
@@ -281,13 +281,13 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return H2O::gasIsIdeal(); }
 
     /*!
      * \brief Returns true if the gas phase is assumed to be compressible
      */
-    static bool gasIsCompressible()
+    static constexpr bool gasIsCompressible()
     { return H2O::gasIsCompressible(); }
 
     /*!
diff --git a/dumux/material/components/cao.hh b/dumux/material/components/cao.hh
index 46d235f1da26673b1524ed27f64e582a6110badc..4dff7a03b36a70e1a5314baab18da60de6b386f0 100644
--- a/dumux/material/components/cao.hh
+++ b/dumux/material/components/cao.hh
@@ -56,7 +56,7 @@ public:
     /*!
      * \brief The molar mass of CaOH2 in \f$\mathrm{[kg/mol]}\f$.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     {
         return 56.0774e-3;
     }
diff --git a/dumux/material/components/cao2h2.hh b/dumux/material/components/cao2h2.hh
index b972105db8a4b102f9f99efc5bae8f14387cae38..b7bb8db72c82e3ffd2a3117ad271fb0bed1c9d68 100644
--- a/dumux/material/components/cao2h2.hh
+++ b/dumux/material/components/cao2h2.hh
@@ -57,7 +57,7 @@ public:
     /*!
      * \brief The molar mass of CaOH2 in \f$\mathrm{[kg/mol]}\f$.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     {
         return 74.093e-3 ;
     }
diff --git a/dumux/material/components/ch4.hh b/dumux/material/components/ch4.hh
index 6011d61751ad5c3455727ffc29a0fa95f7279354..bbc44d68dcb5442cc0f8f408622e6ae24de4d78b 100644
--- a/dumux/material/components/ch4.hh
+++ b/dumux/material/components/ch4.hh
@@ -56,7 +56,7 @@ public:
     /*!
      * \brief The molar mass in \f$\mathrm{[kg/mol]}\f$ of molecular methane.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     { return 16.043e-3; /* [kg/mol] */}
 
     /*!
@@ -95,7 +95,7 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be compressible
      */
-    static bool gasIsCompressible()
+    static constexpr bool gasIsCompressible()
     { return true; }
 
     /*!
@@ -122,7 +122,7 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return true; }
 
     /*!
diff --git a/dumux/material/components/co2.hh b/dumux/material/components/co2.hh
index 940803413a7cd432fec968e9332b3b058184cf2c..d8e303f6180c8a47d085c58e45e2b560d8b2a451 100644
--- a/dumux/material/components/co2.hh
+++ b/dumux/material/components/co2.hh
@@ -68,7 +68,7 @@ public:
     /*!
      * \brief The mass in \f$\mathrm{[kg/mol]}\f$ of one mole of CO2.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     { return 44e-3; /* [kg/mol] */ }
 
     /*!
diff --git a/dumux/material/components/granite.hh b/dumux/material/components/granite.hh
index 913029c5310478b777a62c666f958434e378fc98..77a8b7a85bb08cb594b806309c45e56622959c19 100644
--- a/dumux/material/components/granite.hh
+++ b/dumux/material/components/granite.hh
@@ -61,7 +61,7 @@ public:
     /*!
      * \brief The molar mass of Siliciumoxide which is 70 % of granite in \f$\mathrm{[kg/mol]}\f$.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     {
         return 60.08e-3;
     }
diff --git a/dumux/material/components/h2.hh b/dumux/material/components/h2.hh
index f34e7524525c6599049b64cce504b06d810499ff..842c310014ad7427d77c8bbd90c8d82fe2f55926 100644
--- a/dumux/material/components/h2.hh
+++ b/dumux/material/components/h2.hh
@@ -57,7 +57,7 @@ public:
     /*!
      * \brief The molar mass in \f$\mathrm{[kg/mol]}\f$ of molecular hydrogen.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     { return 2.01588e-3; }
 
     /*!
@@ -131,13 +131,13 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be compressible
      */
-    static bool gasIsCompressible()
+    static constexpr bool gasIsCompressible()
     { return true; }
 
     /*!
      * \brief Returns true if the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return true; }
 
     /*!
diff --git a/dumux/material/components/heavyoil.hh b/dumux/material/components/heavyoil.hh
index 141d9b61f7b645f342d3934419c012f95ad8f1d3..bdc4aeec9fb712a34bbf4dad886f03434a166429 100644
--- a/dumux/material/components/heavyoil.hh
+++ b/dumux/material/components/heavyoil.hh
@@ -384,13 +384,13 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be compressible
      */
-    static bool gasIsCompressible()
+    static constexpr bool gasIsCompressible()
     { return true; }
 
     /*!
      * \brief Returns true if the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return true; }
 
     /*!
diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh
index ec732d2d10e1b3d17a302cfe94e1edf333847268..4486c3d71c726d70554f79db4dcd6ace6e2adc65 100644
--- a/dumux/material/components/mesitylene.hh
+++ b/dumux/material/components/mesitylene.hh
@@ -258,13 +258,13 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be compressible
      */
-    static bool gasIsCompressible()
+    static constexpr bool gasIsCompressible()
     { return true; }
 
     /*!
      * \brief Returns true if the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return true; }
 
     /*!
diff --git a/dumux/material/components/n2.hh b/dumux/material/components/n2.hh
index 04a953e6b769f3dd3affb98243fa99ff860a731c..81398d458f9213c94a40dc4ddaacc0f13ac10493 100644
--- a/dumux/material/components/n2.hh
+++ b/dumux/material/components/n2.hh
@@ -57,7 +57,7 @@ public:
     /*!
      * \brief The molar mass in \f$\mathrm{[kg/mol]}\f$ of molecular nitrogen.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     { return 28.0134e-3;}
 
     /*!
@@ -146,13 +146,13 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be compressible
      */
-    static bool gasIsCompressible()
+    static constexpr bool gasIsCompressible()
     { return true; }
 
     /*!
      * \brief Returns true if the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return true; }
 
     /*!
diff --git a/dumux/material/components/nacl.hh b/dumux/material/components/nacl.hh
index 038c2e1df91443e13cca75240cd1288194ade1ca..2077c4e49fdf57e33b5dfbc14ab1b2c663d0d301 100644
--- a/dumux/material/components/nacl.hh
+++ b/dumux/material/components/nacl.hh
@@ -57,7 +57,7 @@ public:
     /*!
      * \brief The molar mass of NaCl in \f$\mathrm{[kg/mol]}\f$.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     {
         return 58.4428e-3 ;
     }
diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh
index c6f34a39e293c7f86c1acc90082f2a792b0e07ab..7a6dcce9273d11770a1bd3cb296ec423be726b9b 100644
--- a/dumux/material/components/simpleh2o.hh
+++ b/dumux/material/components/simpleh2o.hh
@@ -63,7 +63,7 @@ public:
     /*!
      * \brief The molar mass in \f$\mathrm{[kg/mol]}\f$ of water.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     { return 18e-3; }
 
     /*!
@@ -235,7 +235,7 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return true; }
 
     /*!
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index 497ca323642865fb188f8037af3ab465229a0400..9abacc1a7ce3b2b316500f7631f708f78cbb67c7 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -158,7 +158,7 @@ public:
     /*!
      * \brief The molar mass in \f$\mathrm{[kg/mol]}\f$ of the component.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     { return RawComponent::molarMass(); }
 
     /*!
@@ -413,7 +413,7 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be compressible
      */
-    static bool gasIsCompressible()
+    static constexpr bool gasIsCompressible()
     { return RawComponent::gasIsCompressible(); }
 
     /*!
@@ -425,7 +425,7 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return RawComponent::gasIsIdeal(); }
 
 
diff --git a/dumux/material/components/trichloroethene.hh b/dumux/material/components/trichloroethene.hh
index d1364126ec054a0c4649acd4dc006c942b7ef763..85b3b7a3343d59ab18da1adbce5e079d975f69ef 100644
--- a/dumux/material/components/trichloroethene.hh
+++ b/dumux/material/components/trichloroethene.hh
@@ -57,7 +57,7 @@ public:
     /*!
      * \brief The molar mass in \f$\mathrm{[kg/mol]}\f$ of TCE.
      */
-    static Scalar molarMass()
+    static constexpr Scalar molarMass()
     {
         return 131.39e-3; // [kg/mol]
     }
@@ -108,7 +108,7 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be compressible
      */
-    static bool gasIsCompressible()
+    static constexpr bool gasIsCompressible()
     { return true; }
 
     /*!
@@ -149,7 +149,7 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return true; }
 
     /*!
diff --git a/dumux/material/components/xylene.hh b/dumux/material/components/xylene.hh
index 050612a15ae64605089f3278cabe621c5875d6a9..010be342dde8eec612a08f44847599ec054dbcbe 100644
--- a/dumux/material/components/xylene.hh
+++ b/dumux/material/components/xylene.hh
@@ -304,13 +304,13 @@ public:
     /*!
      * \brief Returns true if the gas phase is assumed to be compressible
      */
-    static bool gasIsCompressible()
+    static constexpr bool gasIsCompressible()
     { return true; }
 
     /*!
      * \brief Returns true if the gas phase is assumed to be ideal
      */
-    static bool gasIsIdeal()
+    static constexpr bool gasIsIdeal()
     { return true; }
 
     /*!