diff --git a/libs/MeshKernelApi/src/MeshKernel.cpp b/libs/MeshKernelApi/src/MeshKernel.cpp
index cbed6b94e..db11d49a9 100644
--- a/libs/MeshKernelApi/src/MeshKernel.cpp
+++ b/libs/MeshKernelApi/src/MeshKernel.cpp
@@ -1524,9 +1524,7 @@ namespace meshkernelapi
                 throw meshkernel::MeshKernelError("The selected mesh kernel id does not exist.");
             }
 
-            const auto& mesh2d = meshKernelState.at(meshKernelId).m_mesh2d;
-
-            if (!mesh2d || mesh2d->GetNumNodes() <= 0)
+            if (const auto& mesh2d = meshKernelState.at(meshKernelId).m_mesh2d; !mesh2d || mesh2d->GetNumNodes() <= 0)
             {
                 return lastExitCode;
             }
@@ -1559,9 +1557,7 @@ namespace meshkernelapi
                 throw meshkernel::MeshKernelError("The selected mesh kernel id does not exist.");
             }
 
-            const auto& mesh2d = meshKernelState.at(meshKernelId).m_mesh2d;
-
-            if (!mesh2d || mesh2d->GetNumNodes() <= 0)
+            if (const auto& mesh2d = meshKernelState.at(meshKernelId).m_mesh2d; !mesh2d || mesh2d->GetNumNodes() <= 0)
             {
                 return lastExitCode;
             }
@@ -1599,7 +1595,7 @@ namespace meshkernelapi
 
             const auto result = meshKernelState[meshKernelId].m_mesh2d->GetSmoothness();
 
-            std::copy(result.begin(), result.end(), geometryList.values);
+            std::ranges::copy(result, geometryList.values);
         }
         catch (...)
         {
diff --git a/libs/MeshKernelApi/src/PropertyCalculator.cpp b/libs/MeshKernelApi/src/PropertyCalculator.cpp
index fffc501be..a5b6c21aa 100644
--- a/libs/MeshKernelApi/src/PropertyCalculator.cpp
+++ b/libs/MeshKernelApi/src/PropertyCalculator.cpp
@@ -11,7 +11,7 @@ void meshkernelapi::OrthogonalityPropertyCalculator::Calculate(const MeshKernelS
         throw meshkernel::MeshKernelError("GeometryList with wrong dimensions");
     }
 
-    std::copy(values.begin(), values.end(), geometryList.values);
+    std::ranges::copy(values, geometryList.values);
 }
 
 int meshkernelapi::OrthogonalityPropertyCalculator::Size(const MeshKernelState& state) const
@@ -29,7 +29,7 @@ void meshkernelapi::EdgeLengthPropertyCalculator::Calculate(const MeshKernelStat
         throw meshkernel::MeshKernelError("GeometryList with wrong dimensions");
     }
 
-    std::copy(values.begin(), values.end(), geometryList.values);
+    std::ranges::copy(values, geometryList.values);
 }
 
 int meshkernelapi::EdgeLengthPropertyCalculator::Size(const MeshKernelState& state) const