diff --git a/wxdata/include/scwx/wsr88d/rda/rda_prf_data.hpp b/wxdata/include/scwx/wsr88d/rda/rda_prf_data.hpp
index 1a04aacb..eb42268b 100644
--- a/wxdata/include/scwx/wsr88d/rda/rda_prf_data.hpp
+++ b/wxdata/include/scwx/wsr88d/rda/rda_prf_data.hpp
@@ -9,7 +9,7 @@ class RdaPrfData : public Level2Message
 {
 public:
    explicit RdaPrfData();
-   ~RdaPrfData();
+   ~RdaPrfData() override;
 
    RdaPrfData(const RdaPrfData&)            = delete;
    RdaPrfData& operator=(const RdaPrfData&) = delete;
diff --git a/wxdata/include/scwx/wsr88d/rpg/digital_raster_data_array_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/digital_raster_data_array_packet.hpp
index 76b0f2c3..c0309568 100644
--- a/wxdata/include/scwx/wsr88d/rpg/digital_raster_data_array_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/digital_raster_data_array_packet.hpp
@@ -12,7 +12,7 @@ class DigitalRasterDataArrayPacket : public Packet
 {
 public:
    explicit DigitalRasterDataArrayPacket();
-   ~DigitalRasterDataArrayPacket();
+   ~DigitalRasterDataArrayPacket() override;
 
    DigitalRasterDataArrayPacket(const DigitalRasterDataArrayPacket&) = delete;
    DigitalRasterDataArrayPacket&
diff --git a/wxdata/source/scwx/wsr88d/rda/level2_message_factory.cpp b/wxdata/source/scwx/wsr88d/rda/level2_message_factory.cpp
index b253cdf8..7fe5b77e 100644
--- a/wxdata/source/scwx/wsr88d/rda/level2_message_factory.cpp
+++ b/wxdata/source/scwx/wsr88d/rda/level2_message_factory.cpp
@@ -142,9 +142,9 @@ Level2MessageInfo Level2MessageFactory::Create(std::istream&             is,
 
                // Estimate remaining size
                static const std::uint16_t kMinRemainingSegments_ = 100u;
-               std::uint16_t remainingSegments = std::max<std::uint16_t>(
+               const std::uint16_t remainingSegments = std::max<std::uint16_t>(
                   totalSegments - segment + 1, kMinRemainingSegments_);
-               std::size_t remainingSize = remainingSegments * dataSize;
+               const std::size_t remainingSize = remainingSegments * dataSize;
 
                ctx->messageData_.resize(ctx->bufferedSize_ + remainingSize);
             }
diff --git a/wxdata/source/scwx/wsr88d/rda/rda_prf_data.cpp b/wxdata/source/scwx/wsr88d/rda/rda_prf_data.cpp
index d516309b..147714c7 100644
--- a/wxdata/source/scwx/wsr88d/rda/rda_prf_data.cpp
+++ b/wxdata/source/scwx/wsr88d/rda/rda_prf_data.cpp
@@ -42,7 +42,7 @@ bool RdaPrfData::Parse(std::istream& is)
    bool        messageValid = true;
    std::size_t bytesRead    = 0;
 
-   std::streampos isBegin = is.tellg();
+   const std::streampos isBegin = is.tellg();
 
    is.read(reinterpret_cast<char*>(&p->numberOfWaveforms_), 2); // 1
    is.seekg(2, std::ios_base::cur);                             // 2
diff --git a/wxdata/source/scwx/wsr88d/rpg/digital_raster_data_array_packet.cpp b/wxdata/source/scwx/wsr88d/rpg/digital_raster_data_array_packet.cpp
index c03c9244..2e0ef662 100644
--- a/wxdata/source/scwx/wsr88d/rpg/digital_raster_data_array_packet.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/digital_raster_data_array_packet.cpp
@@ -185,7 +185,7 @@ bool DigitalRasterDataArrayPacket::Parse(std::istream& is)
          }
 
          // Read raster bins
-         std::size_t dataSize = p->numberOfCells_;
+         const std::size_t dataSize = p->numberOfCells_;
          row.level_.resize(dataSize);
          is.read(reinterpret_cast<char*>(row.level_.data()),
                  static_cast<std::streamsize>(dataSize));
diff --git a/wxdata/source/scwx/wsr88d/rpg/product_description_block.cpp b/wxdata/source/scwx/wsr88d/rpg/product_description_block.cpp
index 85550966..2d70ad7b 100644
--- a/wxdata/source/scwx/wsr88d/rpg/product_description_block.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/product_description_block.cpp
@@ -1073,11 +1073,11 @@ ProductDescriptionBlock::data_level_code(std::uint8_t level) const
    if (number_of_levels() <= 16 && level < 16 &&
        !uncodedDataLevelProducts_.contains(p->productCode_))
    {
-      std::uint16_t th = data_level_threshold(level);
+      const std::uint16_t th = data_level_threshold(level);
       if ((th & 0x8000u))
       {
          // If bit 0 is one, then the LSB is coded
-         std::uint16_t lsb = th & 0x00ffu;
+         const std::uint16_t lsb = th & 0x00ffu;
 
          switch (lsb)
          {