diff --git a/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh b/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
index da01ea90e387ac58774068b40297de2052eeab48..2d6e85f09df1e3b3ad0d49ba181ec567db0fad80 100644
--- a/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
+++ b/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
@@ -351,8 +351,6 @@ private:
                 auto foundCorrectIdx = [otherIsIdx](const auto& x) { return x.localNormalFaceIdx == otherIsIdx; };
                 const int index = std::find_if(this->pairData_.begin(), this->pairData_.end(), foundCorrectIdx) - this->pairData_.begin();
 
-                assert(this->pairData_[index].outerParallelFaceDofIdx == -1);
-
                 this->pairData_[index].virtualOuterParallelFaceDofPos = std::move(virtualOuterParallelFaceDofPos);
                 this->pairData_[index].parallelDistance = std::move(distance.two_norm());
             }
diff --git a/dumux/implicit/staggered/assemblymap.hh b/dumux/implicit/staggered/assemblymap.hh
index 78f2444b4175fa4601b69ac67f7fbf1c9381fdfc..1fc9fc008636910cce5305ece94253c3c9455e18 100644
--- a/dumux/implicit/staggered/assemblymap.hh
+++ b/dumux/implicit/staggered/assemblymap.hh
@@ -66,7 +66,7 @@ public:
     {
         const auto numDofsCC = problem.model().numCellCenterDofs();
         const auto numDofsFace = problem.model().numFaceDofs();
-        const auto numBoundaryFacets = problem.gridView().grid().numBoundarySegments();
+        const auto numBoundaryFacets = problem.model().globalFvGeometry().numBoundaryScvf();
         cellCenterToCellCenterMap_.resize(numDofsCC);
         cellCenterToFaceMap_.resize(numDofsCC);
         faceToCellCenterMap_.resize(2*numDofsFace - numBoundaryFacets);