diff --git a/wxdata/source/scwx/wsr88d/rpg/level3_message_factory.cpp b/wxdata/source/scwx/wsr88d/rpg/level3_message_factory.cpp
index 04a0f9d9..2d94229e 100644
--- a/wxdata/source/scwx/wsr88d/rpg/level3_message_factory.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/level3_message_factory.cpp
@@ -114,6 +114,10 @@ static const std::unordered_map<int16_t, CreateLevel3MessageFunction> //
             {177, GraphicProductMessage::Create},
             {178, GraphicProductMessage::Create},
             {179, GraphicProductMessage::Create},
+            {180, GraphicProductMessage::Create},
+            {182, GraphicProductMessage::Create},
+            {184, GraphicProductMessage::Create},
+            {186, GraphicProductMessage::Create},
             {193, GraphicProductMessage::Create},
             {195, GraphicProductMessage::Create},
             {196, GraphicProductMessage::Create},
diff --git a/wxdata/source/scwx/wsr88d/rpg/level3_message_header.cpp b/wxdata/source/scwx/wsr88d/rpg/level3_message_header.cpp
index 53ff5686..e5c5866f 100644
--- a/wxdata/source/scwx/wsr88d/rpg/level3_message_header.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/level3_message_header.cpp
@@ -144,7 +144,7 @@ bool Level3MessageHeader::Parse(std::istream& is)
             << logPrefix_ << "Invalid length: " << p->lengthOfMessage_;
          headerValid = false;
       }
-      if (p->sourceId_ > 999u)
+      if ((p->sourceId_ > 999u && p->sourceId_ < 3000) || p->sourceId_ > 3045)
       {
          BOOST_LOG_TRIVIAL(warning)
             << logPrefix_ << "Invalid source ID: " << p->sourceId_;
diff --git a/wxdata/source/scwx/wsr88d/rpg/product_description_block.cpp b/wxdata/source/scwx/wsr88d/rpg/product_description_block.cpp
index c47b4c0a..cf6e8350 100644
--- a/wxdata/source/scwx/wsr88d/rpg/product_description_block.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/product_description_block.cpp
@@ -18,8 +18,9 @@ static const std::string logPrefix_ =
    "[scwx::wsr88d::rpg::product_description_block] ";
 
 static const std::set<int16_t> compressedProducts_ = {
-   32,  94,  99,  134, 135, 138, 149, 152, 153, 154, 155, 159, 161, 163, 165,
-   167, 168, 170, 172, 173, 174, 175, 176, 177, 178, 179, 193, 195, 202};
+   32,  94,  99,  134, 135, 138, 149, 152, 153, 154, 155,
+   159, 161, 163, 165, 167, 168, 170, 172, 173, 174, 175,
+   176, 177, 178, 179, 180, 182, 186, 193, 195, 202};
 
 class ProductDescriptionBlockImpl
 {