diff --git a/src/adjoint_petsc/util/mat_iterator_util.hpp b/src/adjoint_petsc/util/mat_iterator_util.hpp
index ae67e4c..0aae872 100644
--- a/src/adjoint_petsc/util/mat_iterator_util.hpp
+++ b/src/adjoint_petsc/util/mat_iterator_util.hpp
@@ -277,8 +277,8 @@ PetscErrorCode MatIterateAllEntries(Func&& func, First&& mat, Other&& ... other)
     return iterator_implementation::iterateMatAIJ(
         func,
         iterator_implementation::getUnderlyingMat(std::forward<First>(mat)),
-        iterator_implementation::MatAIJValueAccess<std::remove_cvref_t<First>>(std::forward<First>(mat)),
-        iterator_implementation::MatAIJValueAccess<std::remove_cvref_t<Other>>(std::forward<Other>(other))...
+        iterator_implementation::MatAIJValueAccess<std::remove_cv_t<std::remove_reference_t<First>>>(std::forward<First>(mat)),
+        iterator_implementation::MatAIJValueAccess<std::remove_cv_t<std::remove_reference_t<Other>>>(std::forward<Other>(other))...
       );
   }
   else if(ADMatType::ADMatSeqAIJ == type) {
@@ -286,8 +286,8 @@ PetscErrorCode MatIterateAllEntries(Func&& func, First&& mat, Other&& ... other)
         func,
         iterator_implementation::getUnderlyingMat(std::forward<First>(mat)),
         nullptr,
-        iterator_implementation::MatSeqAIJValueAccess<std::remove_cvref_t<First>>(std::forward<First>(mat)),
-        iterator_implementation::MatSeqAIJValueAccess<std::remove_cvref_t<Other>>(std::forward<Other>(other))...
+        iterator_implementation::MatSeqAIJValueAccess<std::remove_cv_t<std::remove_reference_t<First>>>(std::forward<First>(mat)),
+        iterator_implementation::MatSeqAIJValueAccess<std::remove_cv_t<std::remove_reference_t<Other>>>(std::forward<Other>(other))...
       );
   }
   else {
@@ -305,8 +305,8 @@ PetscErrorCode MatAccessValue(Func&& func, PetscInt row, PetscInt col, First&& m
         row,
         col,
         iterator_implementation::getUnderlyingMat(std::forward<First>(mat)),
-        iterator_implementation::MatAIJValueAccess<std::remove_cvref_t<First>>(std::forward<First>(mat)),
-        iterator_implementation::MatAIJValueAccess<std::remove_cvref_t<Other>>(std::forward<Other>(other))...
+        iterator_implementation::MatAIJValueAccess<std::remove_cv_t<std::remove_reference_t<First>>>(std::forward<First>(mat)),
+        iterator_implementation::MatAIJValueAccess<std::remove_cv_t<std::remove_reference_t<Other>>>(std::forward<Other>(other))...
       );
   }
   else if(ADMatType::ADMatSeqAIJ == type) {
@@ -316,8 +316,8 @@ PetscErrorCode MatAccessValue(Func&& func, PetscInt row, PetscInt col, First&& m
         col,
         iterator_implementation::getUnderlyingMat(std::forward<First>(mat)),
         nullptr,
-        iterator_implementation::MatSeqAIJValueAccess<std::remove_cvref_t<First>>(std::forward<First>(mat)),
-        iterator_implementation::MatSeqAIJValueAccess<std::remove_cvref_t<Other>>(std::forward<Other>(other))...
+        iterator_implementation::MatSeqAIJValueAccess<std::remove_cv_t<std::remove_reference_t<First>>>(std::forward<First>(mat)),
+        iterator_implementation::MatSeqAIJValueAccess<std::remove_cv_t<std::remove_reference_t<Other>>>(std::forward<Other>(other))...
       );
   }
   else {
diff --git a/src/adjoint_petsc/util/vec_iterator_util.hpp b/src/adjoint_petsc/util/vec_iterator_util.hpp
index 9faf42e..0127d01 100644
--- a/src/adjoint_petsc/util/vec_iterator_util.hpp
+++ b/src/adjoint_petsc/util/vec_iterator_util.hpp
@@ -154,8 +154,8 @@ PetscErrorCode VecIterateIndexSet(Func&& func, PetscInt n, PetscInt const* ix, F
         n,
         ix,
         iterator_implementation::getUnderlyingVec(std::forward<First>(vec)),
-        iterator_implementation::VecLocalValueAccess<std::remove_cvref_t<First>>(std::forward<First>(vec)),
-        iterator_implementation::VecLocalValueAccess<std::remove_cvref_t<Other>>(std::forward<Other>(other))...
+        iterator_implementation::VecLocalValueAccess<std::remove_cv_t<std::remove_reference_t<First>>>(std::forward<First>(vec)),
+        iterator_implementation::VecLocalValueAccess<std::remove_cv_t<std::remove_reference_t<Other>>>(std::forward<Other>(other))...
         );
   }
   else {