diff --git a/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverHeader.template b/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverHeader.template
index e1af559d7c2b599ab237c1eeee7ecaf01b9e8ed9..a75d5bd28037e024c4b106d7fa187947ed9d2b90 100644
--- a/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverHeader.template
+++ b/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverHeader.template
@@ -236,7 +236,7 @@ class {{project}}::{{solver}} : public {{project}}::{{abstractSolver}} {
      * @param[inout] BgradQ the nonconservative product (extends nVar), 
      *                      already allocated. 
      */
-    void nonConservativeProduct(const double* const Q,const double* const gradQ,double* const BgradQ) final override;
+    void nonConservativeProduct(const double* const Q,const double* const * const gradQ,double** const BgradQ) final override;
 {% else %}
 /* nonConservativeProduct() function is not included, as requested in the specification file */
 {% endif %}
@@ -285,7 +285,7 @@ class {{project}}::{{solver}} : public {{project}}::{{abstractSolver}} {
      * @param[inout] rhs the right-hand side associated with Q; 
      *                   range: [0,nVar-1], already allocated.
      */
-    void multiplyMaterialParameterMatrix(const double* const Q, double* const rhs) final override;
+    void multiplyMaterialParameterMatrix(const double* const Q, double** const rhs) final override;
 {% else %}
 /* multiplyMaterialParameterMatrix() not included, as requested in the specification file */
 {% endif %}
diff --git a/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverInCUserCode.template b/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverInCUserCode.template
index d89cb3b910c24c26c91f2a561630d518ff7fa0ff..f2c079c10d8da85ce38591b3caf1446768bb2470 100644
--- a/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverInCUserCode.template
+++ b/Toolkit/exahype/toolkit/templates/solvers/ADERDGSolverInCUserCode.template
@@ -34,19 +34,8 @@ void {{project}}::{{solver}}::adjustSolution(double* const luh, const tarch::la:
   // Tip: See header file "peano/utils/Loop.h" for dimension-agnostic for loops.
   
   // @todo Please implement/augment if required
-  if (tarch::la::equals(t,0.0)) {
-    //initialise luh
-    constexpr int sizeOfQ = NumberOfVariables+NumberOfParameters;
-    dfor(i,Order+1) {
-      const int iLinearised = dLinearised(i,Order+1);
-      double* const Q = luh + iLinearised * sizeOfQ;  // pointwise state variables (plus parameters)
-      
-      {% for i in range_0_nVarParam %}
-      Q[{{i}}] = 0.0;
-      {% endfor %} 
-    }
-  }
 }
+
 {% else %}
 void {{project}}::{{solver}}::adjustPointSolution(const double* const x,const double t,const double dt,double* const Q) {
   // Tip: You find documentation for this method in header file "{{project}}::{{solver}}.h".
@@ -176,14 +165,17 @@ void {{project}}::{{solver}}::algebraicSource(const tarch::la::Vector<DIMENSIONS
 {% endif %}
 
 {% if useNCP %}
-void  {{project}}::{{solver}}::nonConservativeProduct(const double* const Q,const double* const gradQ,double* const BgradQ) {
+
+void  {{project}}::{{solver}}::nonConservativeProduct(const double* const Q,const double* const * const gradQ,double** const BgradQ) {
   // Tip: You find documentation for this method in header file "{{project}}::{{solver}}.h".
   // Tip: See header file "{{project}}::{{abstractSolver}}.h" for toolkit generated compile-time 
   //      constants such as Order, NumberOfVariables, and NumberOfParameters.
   
   // @todo Please implement/augment if required
+  {% for d in range_0_nDim %}
   {% for i in range_0_nVar %}
-  BgradQ[{{i}}] = 0.0;
+  BgradQ[{{d}}][{{i}}] = 0.0;
+  {% endfor %}
   {% endfor %}
 }
 {% endif %}
@@ -218,7 +210,7 @@ void  {{project}}::{{solver}}::pointSource(const double* const Q,const double* c
     /**
      * @TODO LR : document
      */
-void {{project}}::{{solver}}::multiplyMaterialParameterMatrix(const double* const Q, double* const rhs) {
+void {{project}}::{{solver}}::multiplyMaterialParameterMatrix(const double* const Q, double** const rhs) {
   // Tip: You find documentation for this method in header file "{{project}}::{{solver}}.h".
   // Tip: See header file "{{project}}::{{abstractSolver}}.h" for toolkit generated compile-time 
   //      constants such as Order, NumberOfVariables, and NumberOfParameters.