diff --git a/Core/include/Acts/EventData/TrackStatePropMask.hpp b/Core/include/Acts/EventData/TrackStatePropMask.hpp
index 5ef5be985bb..1523b5ab13b 100644
--- a/Core/include/Acts/EventData/TrackStatePropMask.hpp
+++ b/Core/include/Acts/EventData/TrackStatePropMask.hpp
@@ -10,6 +10,7 @@
 
 #include "Acts/Utilities/EnumBitwiseOperators.hpp"
 
+#include <cstdint>
 #include <limits>
 #include <ostream>
 #include <type_traits>
@@ -24,7 +25,7 @@ namespace Acts {
 /// a jacobian.
 /// The enum is used as a strong type wrapper around the bits to prevent
 /// autoconversion from integer
-enum struct TrackStatePropMask : uint8_t {
+enum struct TrackStatePropMask : std::uint8_t {
   None = 0,
   Predicted = 1 << 0,
   Filtered = 1 << 1,
@@ -33,7 +34,7 @@ enum struct TrackStatePropMask : uint8_t {
 
   Calibrated = 1 << 4,
 
-  All = std::numeric_limits<uint8_t>::max(),  // should be all ones
+  All = std::numeric_limits<std::uint8_t>::max(),  // should be all ones
 };
 
 ACTS_DEFINE_ENUM_BITWISE_OPERATORS(TrackStatePropMask)
diff --git a/Examples/Algorithms/TrackFitting/src/RefittingCalibrator.cpp b/Examples/Algorithms/TrackFitting/src/RefittingCalibrator.cpp
index 99a8d99634f..b0ad1148d7b 100644
--- a/Examples/Algorithms/TrackFitting/src/RefittingCalibrator.cpp
+++ b/Examples/Algorithms/TrackFitting/src/RefittingCalibrator.cpp
@@ -12,7 +12,7 @@ namespace ActsExamples {
 
 void RefittingCalibrator::calibrate(const Acts::GeometryContext& /*gctx*/,
                                     Proxy trackState) const {
-  const auto& sl =
+  const auto sl =
       trackState.getUncalibratedSourceLink().get<RefittingSourceLink>();
 
   // Here we construct a measurement by extracting the information available