diff --git a/wxdata/include/scwx/wsr88d/rpg/cell_trend_data_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/cell_trend_data_packet.hpp
index 071cb045..c70e52ff 100644
--- a/wxdata/include/scwx/wsr88d/rpg/cell_trend_data_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/cell_trend_data_packet.hpp
@@ -26,7 +26,7 @@ public:
    CellTrendDataPacket(CellTrendDataPacket&&) noexcept;
    CellTrendDataPacket& operator=(CellTrendDataPacket&&) noexcept;
 
-   uint16_t    packet_code() const;
+   uint16_t    packet_code() const override;
    uint16_t    length_of_block() const;
    std::string cell_id() const;
    int16_t     i_position() const;
diff --git a/wxdata/include/scwx/wsr88d/rpg/cell_trend_volume_scan_times.hpp b/wxdata/include/scwx/wsr88d/rpg/cell_trend_volume_scan_times.hpp
index 0ae11183..46312b84 100644
--- a/wxdata/include/scwx/wsr88d/rpg/cell_trend_volume_scan_times.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/cell_trend_volume_scan_times.hpp
@@ -27,7 +27,7 @@ public:
    CellTrendVolumeScanTimes(CellTrendVolumeScanTimes&&) noexcept;
    CellTrendVolumeScanTimes& operator=(CellTrendVolumeScanTimes&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t length_of_block() const;
    uint16_t number_of_volumes() const;
    uint16_t latest_volume_pointer() const;
diff --git a/wxdata/include/scwx/wsr88d/rpg/digital_precipitation_data_array_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/digital_precipitation_data_array_packet.hpp
index c86ccca6..a821456a 100644
--- a/wxdata/include/scwx/wsr88d/rpg/digital_precipitation_data_array_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/digital_precipitation_data_array_packet.hpp
@@ -30,7 +30,7 @@ public:
    DigitalPrecipitationDataArrayPacket&
    operator=(DigitalPrecipitationDataArrayPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t number_of_lfm_boxes_in_row() const;
    uint16_t number_of_rows() const;
 
diff --git a/wxdata/include/scwx/wsr88d/rpg/digital_radial_data_array_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/digital_radial_data_array_packet.hpp
index 50c3e1bb..9b94ba34 100644
--- a/wxdata/include/scwx/wsr88d/rpg/digital_radial_data_array_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/digital_radial_data_array_packet.hpp
@@ -28,7 +28,7 @@ public:
    DigitalRadialDataArrayPacket&
    operator=(DigitalRadialDataArrayPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t index_of_first_range_bin() const;
    uint16_t number_of_range_bins() const;
    int16_t  i_center_of_sweep() const;
diff --git a/wxdata/include/scwx/wsr88d/rpg/generic_data_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/generic_data_packet.hpp
index 15cddff5..2d4ca0a1 100644
--- a/wxdata/include/scwx/wsr88d/rpg/generic_data_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/generic_data_packet.hpp
@@ -26,7 +26,7 @@ public:
    GenericDataPacket(GenericDataPacket&&) noexcept;
    GenericDataPacket& operator=(GenericDataPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint32_t length_of_block() const;
 
    size_t data_size() const override;
diff --git a/wxdata/include/scwx/wsr88d/rpg/linked_contour_vector_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/linked_contour_vector_packet.hpp
index c9830567..0d4bde0e 100644
--- a/wxdata/include/scwx/wsr88d/rpg/linked_contour_vector_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/linked_contour_vector_packet.hpp
@@ -27,7 +27,7 @@ public:
    LinkedContourVectorPacket(LinkedContourVectorPacket&&) noexcept;
    LinkedContourVectorPacket& operator=(LinkedContourVectorPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t initial_point_indicator() const;
    uint16_t length_of_vectors() const;
 
diff --git a/wxdata/include/scwx/wsr88d/rpg/linked_vector_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/linked_vector_packet.hpp
index 56a49134..47c03070 100644
--- a/wxdata/include/scwx/wsr88d/rpg/linked_vector_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/linked_vector_packet.hpp
@@ -4,6 +4,7 @@
 
 #include <cstdint>
 #include <memory>
+#include <optional>
 
 namespace scwx
 {
@@ -26,7 +27,7 @@ public:
    LinkedVectorPacket(LinkedVectorPacket&&) noexcept;
    LinkedVectorPacket& operator=(LinkedVectorPacket&&) noexcept;
 
-   uint16_t                packet_code() const;
+   uint16_t                packet_code() const override;
    uint16_t                length_of_block() const;
    std::optional<uint16_t> value_of_vector() const;
 
diff --git a/wxdata/include/scwx/wsr88d/rpg/precipitation_rate_data_array_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/precipitation_rate_data_array_packet.hpp
index f8aaf159..c15c7f2c 100644
--- a/wxdata/include/scwx/wsr88d/rpg/precipitation_rate_data_array_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/precipitation_rate_data_array_packet.hpp
@@ -30,7 +30,7 @@ public:
    PrecipitationRateDataArrayPacket&
    operator=(PrecipitationRateDataArrayPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t number_of_lfm_boxes_in_row() const;
    uint16_t number_of_rows() const;
 
diff --git a/wxdata/include/scwx/wsr88d/rpg/radial_data_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/radial_data_packet.hpp
index 1ba8f41b..dd6e61ec 100644
--- a/wxdata/include/scwx/wsr88d/rpg/radial_data_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/radial_data_packet.hpp
@@ -26,7 +26,7 @@ public:
    RadialDataPacket(RadialDataPacket&&) noexcept;
    RadialDataPacket& operator=(RadialDataPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t index_of_first_range_bin() const;
    uint16_t number_of_range_bins() const;
    int16_t  i_center_of_sweep() const;
diff --git a/wxdata/include/scwx/wsr88d/rpg/raster_data_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/raster_data_packet.hpp
index b24f87b0..84a20489 100644
--- a/wxdata/include/scwx/wsr88d/rpg/raster_data_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/raster_data_packet.hpp
@@ -26,7 +26,7 @@ public:
    RasterDataPacket(RasterDataPacket&&) noexcept;
    RasterDataPacket& operator=(RasterDataPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t op_flag(size_t i) const;
    int16_t  i_coordinate_start() const;
    int16_t  j_coordinate_start() const;
diff --git a/wxdata/include/scwx/wsr88d/rpg/set_color_level_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/set_color_level_packet.hpp
index 902624c3..9d55596a 100644
--- a/wxdata/include/scwx/wsr88d/rpg/set_color_level_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/set_color_level_packet.hpp
@@ -26,7 +26,7 @@ public:
    SetColorLevelPacket(SetColorLevelPacket&&) noexcept;
    SetColorLevelPacket& operator=(SetColorLevelPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t color_value_indicator() const;
    uint16_t value_of_contour() const;
 
diff --git a/wxdata/include/scwx/wsr88d/rpg/special_graphic_symbol_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/special_graphic_symbol_packet.hpp
index e730d20c..41596ca2 100644
--- a/wxdata/include/scwx/wsr88d/rpg/special_graphic_symbol_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/special_graphic_symbol_packet.hpp
@@ -27,7 +27,7 @@ public:
    SpecialGraphicSymbolPacket(SpecialGraphicSymbolPacket&&) noexcept;
    SpecialGraphicSymbolPacket& operator=(SpecialGraphicSymbolPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t length_of_block() const;
 
    size_t data_size() const override;
diff --git a/wxdata/include/scwx/wsr88d/rpg/text_and_special_symbol_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/text_and_special_symbol_packet.hpp
index fdd5d607..18cccb75 100644
--- a/wxdata/include/scwx/wsr88d/rpg/text_and_special_symbol_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/text_and_special_symbol_packet.hpp
@@ -4,6 +4,7 @@
 
 #include <cstdint>
 #include <memory>
+#include <optional>
 #include <string>
 
 namespace scwx
@@ -28,7 +29,7 @@ public:
    TextAndSpecialSymbolPacket(TextAndSpecialSymbolPacket&&) noexcept;
    TextAndSpecialSymbolPacket& operator=(TextAndSpecialSymbolPacket&&) noexcept;
 
-   uint16_t                packet_code() const;
+   uint16_t                packet_code() const override;
    uint16_t                length_of_block() const;
    std::optional<uint16_t> value_of_text() const;
    int16_t                 start_i() const;
diff --git a/wxdata/include/scwx/wsr88d/rpg/unlinked_contour_vector_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/unlinked_contour_vector_packet.hpp
index 794a1579..60a090bc 100644
--- a/wxdata/include/scwx/wsr88d/rpg/unlinked_contour_vector_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/unlinked_contour_vector_packet.hpp
@@ -28,7 +28,7 @@ public:
    UnlinkedContourVectorPacket&
    operator=(UnlinkedContourVectorPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t length_of_vectors() const;
 
    size_t data_size() const override;
diff --git a/wxdata/include/scwx/wsr88d/rpg/unlinked_vector_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/unlinked_vector_packet.hpp
index 418f4fad..1e25a7d7 100644
--- a/wxdata/include/scwx/wsr88d/rpg/unlinked_vector_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/unlinked_vector_packet.hpp
@@ -4,6 +4,7 @@
 
 #include <cstdint>
 #include <memory>
+#include <optional>
 
 namespace scwx
 {
@@ -26,7 +27,7 @@ public:
    UnlinkedVectorPacket(UnlinkedVectorPacket&&) noexcept;
    UnlinkedVectorPacket& operator=(UnlinkedVectorPacket&&) noexcept;
 
-   uint16_t                packet_code() const;
+   uint16_t                packet_code() const override;
    uint16_t                length_of_block() const;
    std::optional<uint16_t> value_of_vector() const;
 
diff --git a/wxdata/include/scwx/wsr88d/rpg/vector_arrow_data_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/vector_arrow_data_packet.hpp
index 57464fcb..c067c2a9 100644
--- a/wxdata/include/scwx/wsr88d/rpg/vector_arrow_data_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/vector_arrow_data_packet.hpp
@@ -26,7 +26,7 @@ public:
    VectorArrowDataPacket(VectorArrowDataPacket&&) noexcept;
    VectorArrowDataPacket& operator=(VectorArrowDataPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t length_of_block() const;
 
    size_t data_size() const override;
diff --git a/wxdata/include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp b/wxdata/include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp
index 1eab0230..434f8bb6 100644
--- a/wxdata/include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp
+++ b/wxdata/include/scwx/wsr88d/rpg/wind_barb_data_packet.hpp
@@ -26,7 +26,7 @@ public:
    WindBarbDataPacket(WindBarbDataPacket&&) noexcept;
    WindBarbDataPacket& operator=(WindBarbDataPacket&&) noexcept;
 
-   uint16_t packet_code() const;
+   uint16_t packet_code() const override;
    uint16_t length_of_block() const;
 
    size_t data_size() const override;