diff --git a/traffxml/traff_model.hpp b/traffxml/traff_model.hpp
index 40bded85a..e169e1208 100644
--- a/traffxml/traff_model.hpp
+++ b/traffxml/traff_model.hpp
@@ -341,7 +341,7 @@ struct TraffEvent
 {
   EventClass m_class = EventClass::Invalid;
   EventType m_type = EventType::Invalid;
-  std::optional<uint8_t> m_length;
+  std::optional<uint16_t> m_length;
   std::optional<uint8_t> m_probability;
   std::optional<uint16_t> m_qDurationMins;
   /*
diff --git a/traffxml/traff_model_xml.cpp b/traffxml/traff_model_xml.cpp
index b61bde7e9..bc9026527 100644
--- a/traffxml/traff_model_xml.cpp
+++ b/traffxml/traff_model_xml.cpp
@@ -122,13 +122,13 @@ const boost::bimap<std::string, EventType> kEventTypeMap = MakeBimap<std::string
  * @param attribute The XML attribute to retrieve.
  * @return `true` on success, `false` if the attribute is not set or does not contain an integer value.
  */
-std::optional<uint8_t> OptionalIntegerFromXml(pugi::xml_attribute const & attribute)
+std::optional<int> OptionalIntegerFromXml(pugi::xml_attribute const & attribute)
 {
   if (attribute.empty())
     return std::nullopt;
   try
   {
-    uint8_t result = std::stoi(attribute.as_string());
+    int result = std::stoi(attribute.as_string());
     return result;
   }
   catch (std::invalid_argument const& ex)