diff --git a/dumux/common/splinecommon_.hh b/dumux/common/splinecommon_.hh
index e38a5859ad42ab6cc7d5836dfe7056bd1c33551b..872672fc2592686a6c3a7da387d3eaa3652d4bcc 100644
--- a/dumux/common/splinecommon_.hh
+++ b/dumux/common/splinecommon_.hh
@@ -85,7 +85,6 @@ public:
         const int n = numSamples_() - 1;
         for (int i = 0; i <= k; ++i) {
             double x = i*(x1 - x0)/k + x0;
-            double x_p1 = x + (x1 - x0)/k;
             double y;
             double dy_dx;
             double mono = 1;
@@ -108,6 +107,7 @@ public:
             else {
                 y = eval(x);
                 dy_dx = evalDerivative(x);
+                double x_p1 = x + (x1 - x0)/k;
                 mono = monotonic(max<Scalar>(x_(0), x), min<Scalar>(x_(n), x_p1));
             }
 
diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh
index 810d3601f425d58502921dc771b94faeb293b72f..e7fc270537b2fb39f6b9be38fb8569afa27e2062 100644
--- a/dumux/material/fluidsystems/h2oairxylene.hh
+++ b/dumux/material/fluidsystems/h2oairxylene.hh
@@ -372,8 +372,6 @@ public:
                                        int phaseIdx,
                                        int compIdx)
     {
-        Scalar diffCont;
-
         Scalar temperature = fluidState.temperature(phaseIdx);
         Scalar pressure = fluidState.pressure(phaseIdx);
         if (phaseIdx==gPhaseIdx) {
@@ -402,6 +400,8 @@ public:
             Scalar xww = fluidState.moleFraction(wPhaseIdx, H2OIdx);
             Scalar xwc = fluidState.moleFraction(wPhaseIdx, NAPLIdx);
 
+            Scalar diffCont;
+
             switch (compIdx) {
             case NAPLIdx:
                 diffCont = (1.- xww)/(xwa/diffAWl + xwc/diffWCl);