diff --git a/scripts/cmake-presets/ci-ubuntu-github.json b/scripts/cmake-presets/ci-ubuntu-github.json
index 67c067d299..7a40df8f80 100644
--- a/scripts/cmake-presets/ci-ubuntu-github.json
+++ b/scripts/cmake-presets/ci-ubuntu-github.json
@@ -78,8 +78,8 @@
     },
     {
       "name": "reldeb-vecgeom-clang-tidy",
-      "description": "Build with ORANGE and clang-tidy checks",
-      "inherits": ["spack", ".vecgeom"],
+      "description": "Build with VecGeom and clang-tidy checks",
+      "inherits": [".vecgeom", "spack"],
       "cacheVariables": {
         "CELERITAS_DEBUG":       {"type": "BOOL", "value": "ON"},
         "CELERITAS_BUILD_TESTS": {"type": "BOOL", "value": "OFF"},
diff --git a/src/celeritas/alongstep/detail/PropagationApplier.hh b/src/celeritas/alongstep/detail/PropagationApplier.hh
index 8b48751329..f66d98bf62 100644
--- a/src/celeritas/alongstep/detail/PropagationApplier.hh
+++ b/src/celeritas/alongstep/detail/PropagationApplier.hh
@@ -113,6 +113,8 @@ PropagationApplierBaseImpl<MP>::operator()(CoreTrackView& track)
 #if CELERITAS_DEBUG
         Real3 const orig_pos = track.make_geo_view().pos();
 #endif
+        // False positive(fixed in clang-tidy-18)
+        // NOLINTNEXTLINE(clang-analyzer-core.CallAndMessage)
         auto propagate = make_propagator(track);
         p = propagate(sim.step_length());
         tracks_can_loop = propagate.tracks_can_loop();
diff --git a/src/geocel/vg/VecgeomParams.hh b/src/geocel/vg/VecgeomParams.hh
index 6191176e88..2cdae58ba5 100644
--- a/src/geocel/vg/VecgeomParams.hh
+++ b/src/geocel/vg/VecgeomParams.hh
@@ -46,7 +46,7 @@ class VecgeomParams final : public GeoParamsInterface,
     explicit VecgeomParams(G4VPhysicalVolume const* world);
 
     // Clean up VecGeom on destruction
-    ~VecgeomParams();
+    ~VecgeomParams() final;
 
     //! Whether safety distance calculations are accurate and precise
     bool supports_safety() const final { return true; }