diff --git a/test/freeflow/shallowwater/roughchannel/problem.hh b/test/freeflow/shallowwater/roughchannel/problem.hh
index 3289d29830f87e9f22e79d3fd30ac43453a5d4c1..0f4454d6d9e8bba2c748fb23acf2c0a9ffc22de7 100644
--- a/test/freeflow/shallowwater/roughchannel/problem.hh
+++ b/test/freeflow/shallowwater/roughchannel/problem.hh
@@ -119,6 +119,8 @@ class RoughChannelProblem : public ShallowWaterProblem<TypeTag>
     using FVGridGeometry = GetPropType<TypeTag, Properties::FVGridGeometry>;
     using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
+    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
+    using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
     using VolumeVariables = typename ElementVolumeVariables::VolumeVariables;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::FVGridGeometry>::LocalView;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
@@ -287,6 +289,7 @@ public:
     NeumannFluxes neumann(const Element& element,
                           const FVElementGeometry& fvGeometry,
                           const ElementVolumeVariables& elemVolVars,
+                          const ElementFluxVariablesCache& elemFluxVarsCache,
                           const SubControlVolumeFace& scvf) const
     {
         NeumannFluxes values(0.0);
diff --git a/test/freeflow/shallowwater/roughchannel/spatialparams.hh b/test/freeflow/shallowwater/roughchannel/spatialparams.hh
index 4bafe5fa13284fc2c8fe87388177c28dbfe80e5d..87bea05d508e62ced47cb91866983ad7ec73fd8a 100644
--- a/test/freeflow/shallowwater/roughchannel/spatialparams.hh
+++ b/test/freeflow/shallowwater/roughchannel/spatialparams.hh
@@ -70,7 +70,7 @@ public:
           Scalar manningN = getParam<Scalar>("Problem.ManningN");
           frictionLaw_ = std::make_unique<FrictionLawManning<VolumeVariables>>(gravity_, manningN);
       }
-      if (frictionLawType_ == "Nikuradse")
+      else if (frictionLawType_ == "Nikuradse")
       {
           Scalar ks = getParam<Scalar>("Problem.Ks"); // equivalent sand roughness
           frictionLaw_ = std::make_unique<FrictionLawNikuradse<VolumeVariables>>(ks);