diff --git a/dumux/implicit/staggered/localjacobian.hh b/dumux/implicit/staggered/localjacobian.hh
index dc53aa06c72e2031de38db0e33309fe5db38eef0..9c73aeb932366d2d4c574e3735b0aff41505c06a 100644
--- a/dumux/implicit/staggered/localjacobian.hh
+++ b/dumux/implicit/staggered/localjacobian.hh
@@ -168,7 +168,7 @@ public:
         ElementBoundaryTypes elemBcTypes;
         elemBcTypes.update(this->problem_(), element, fvGeometry);
 
-        auto curGlobalFaceVars = this->model_().curGlobalFaceVars();
+        auto& curGlobalFaceVars = this->model_().nonConstCurFaceVars();
         auto& prevGlobalFaceVars = this->model_().prevGlobalFaceVars();
 
         // calculate the local residual for all dofs of this element
diff --git a/dumux/implicit/staggered/model.hh b/dumux/implicit/staggered/model.hh
index 4d76130143fd41ca09b2e11d8d257f47631f7790..30a874dbc39072c2c28dcbcba1e8a789981b13c4 100644
--- a/dumux/implicit/staggered/model.hh
+++ b/dumux/implicit/staggered/model.hh
@@ -58,13 +58,14 @@ namespace Dumux
 template<class TypeTag >
 class StaggeredBaseModel : public ImplicitModel<TypeTag>
 {
-    typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-    typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-    typedef typename GET_PROP_TYPE(TypeTag, GlobalFVGeometry) GlobalFVGeometry;
-    typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
-    typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
-
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
+    using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+    using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+    using GlobalFVGeometry = typename GET_PROP_TYPE(TypeTag, GlobalFVGeometry);
+    using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+    using JacobianAssembler = typename GET_PROP_TYPE(TypeTag, JacobianAssembler);
+
+    using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
 
     enum {
         dim = GridView::dimension,