diff --git a/dumux/assembly/cvfelocalassembler.hh b/dumux/assembly/cvfelocalassembler.hh
index 44ef08fcc45bd3795222f5b316e066cbcefac422..f4e98cca4fa288ff1792471da9f64b568537be8f 100644
--- a/dumux/assembly/cvfelocalassembler.hh
+++ b/dumux/assembly/cvfelocalassembler.hh
@@ -90,7 +90,6 @@ public:
 
     void bindLocalViews()
     {
-        std::cout << "hi" << std::endl;
         ParentType::bindLocalViews();
         this->elemBcTypes().update(this->asImp_().problem(), this->element(), this->fvGeometry());
     }
diff --git a/dumux/multidomain/subdomaincvfelocalassembler.hh b/dumux/multidomain/subdomaincvfelocalassembler.hh
index 4ae95d50c6814f0ee5d3dbbbb6531d95d126ddac..93ffd6333ecb8b46eae6ab2a3580793a4b87d747 100644
--- a/dumux/multidomain/subdomaincvfelocalassembler.hh
+++ b/dumux/multidomain/subdomaincvfelocalassembler.hh
@@ -26,6 +26,8 @@
 #ifndef DUMUX_MULTIDOMAIN_SUBDOMAIN_CVFE_LOCAL_ASSEMBLER_HH
 #define DUMUX_MULTIDOMAIN_SUBDOMAIN_CVFE_LOCAL_ASSEMBLER_HH
 
+#include <type_traits>
+
 #include <dune/common/reservedvector.hh>
 #include <dune/common/indices.hh>
 #include <dune/common/hybridutilities.hh>
@@ -124,7 +126,7 @@ public:
             using namespace Dune::Hybrid;
             forEach(integralRange(Dune::Hybrid::size(jacRow)), [&](auto&& i)
             {
-                if (i != id)
+                if constexpr (std::decay_t<decltype(i)>{} != id)
                     this->assembleJacobianCoupling(i, jacRow, residual, gridVariables);
             });
         };
@@ -198,7 +200,7 @@ public:
         couplingManager_.bindCouplingContext(domainId, element, this->assembler());
         fvGeometry.bind(element);
 
-        if (implicit)
+        if constexpr (implicit)
         {
             curElemVolVars.bind(element, fvGeometry, curSol);
             elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
@@ -327,16 +329,16 @@ public:
         {
             // Update ourself after the context has been modified. Depending on the
             // type of caching, other objects might have to be updated. All ifs can be optimized away.
-            if (enableGridFluxVarsCache)
+            if constexpr (enableGridFluxVarsCache)
             {
-                if (enableGridVolVarsCache)
+                if constexpr (enableGridVolVarsCache)
                     this->couplingManager().updateCoupledVariables(domainI, *this, gridVariables.curGridVolVars(), gridVariables.gridFluxVarsCache());
                 else
                     this->couplingManager().updateCoupledVariables(domainI, *this, curElemVolVars, gridVariables.gridFluxVarsCache());
             }
             else
             {
-                if (enableGridVolVarsCache)
+                if constexpr (enableGridVolVarsCache)
                     this->couplingManager().updateCoupledVariables(domainI, *this, gridVariables.curGridVolVars(), elemFluxVarsCache);
                 else
                     this->couplingManager().updateCoupledVariables(domainI, *this, curElemVolVars, elemFluxVarsCache);
@@ -366,7 +368,7 @@ public:
                 };
 
                 // derive the residuals numerically
-                ElementResidualVector partialDerivs(element.subEntities(dim));
+                ElementResidualVector partialDerivs(fvGeometry.numScv());
 
                 const auto& paramGroup = this->assembler().problem(domainJ).paramGroup();
                 static const int numDiffMethod = getParamFromGroup<int>(paramGroup, "Assembly.NumericDifferenceMethod");