diff --git a/src/main.cpp b/src/main.cpp
index cd2164c..ce3562c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -72,11 +72,11 @@ ReactESP app([]() {
 
   // Set Product information
   nmea2000->SetProductInformation(
-      "20210331",                      // Manufacturer's Model serial code
+      "20210331",                      // Manufacturer's Model serial code (max 32 chars)
       103,                             // Manufacturer's product code
-      "SH-ESP32 NMEA 2000 USB GW",     // Manufacturer's Model ID
-      "0.1.0.0 (2021-03-31)",          // Manufacturer's Software version code
-      "0.0.3.1 (2021-03-07)"           // Manufacturer's Model version
+      "SH-ESP32 NMEA 2000 USB GW",     // Manufacturer's Model ID (max 33 chars)
+      "0.1.0.0 (2021-03-31)",          // Manufacturer's Software version code (max 40 chars)
+      "0.0.3.1 (2021-03-07)"           // Manufacturer's Model version (max 24 chars)
   );
   // Set device information
   nmea2000->SetDeviceInformation(