diff --git a/Source/deviceinfo/device_info/main.c b/Source/deviceinfo/device_info/main.c
index 5eeeb59c..8e2e65f0 100644
--- a/Source/deviceinfo/device_info/main.c
+++ b/Source/deviceinfo/device_info/main.c
@@ -44,7 +44,7 @@ static void toHexString(
         *bufLength = length;
 
     } else {
-        printf("ERROR: bufLength %d is too small for %d chars\n", *bufLength, totalLength);
+        printf("ERROR: bufLength %d is too small for %d chars\n", totalLength);
         *bufLength = 0;
     }
 }
diff --git a/Source/displayinfo/DisplayInfo.cpp b/Source/displayinfo/DisplayInfo.cpp
index f65df1a2..fa5c07ed 100644
--- a/Source/displayinfo/DisplayInfo.cpp
+++ b/Source/displayinfo/DisplayInfo.cpp
@@ -561,7 +561,7 @@ uint32_t displayinfo_parse_edid(const uint8_t buffer[], uint16_t length, display
 
         if(edid.IsValid()) {
             ::memset(edid_info, 0, sizeof(*edid_info));
-            memcpy(edid_info->manufacturer_id, edid.Manufacturer().c_str(), sizeof(edid_info->manufacturer_id));
+            memcpy(edid_info->manufacturer_id, edid.Manufacturer().c_str(), 10*sizeof(edid_info->manufacturer_id));
             edid_info->product_code = edid.ProductCode();
             edid_info->serial_number = edid.Serial();
             edid_info->manufacture_week = edid.Week();
diff --git a/Source/displayinfo/display_info/main.c b/Source/displayinfo/display_info/main.c
index 4e92e770..f987440f 100644
--- a/Source/displayinfo/display_info/main.c
+++ b/Source/displayinfo/display_info/main.c
@@ -125,7 +125,7 @@ static void toHexString(
         *bufLength = length;
 
     } else {
-        printf("ERROR: bufLength %d is too small for %d chars\n", *bufLength, totalLength);
+        printf("ERROR: bufLength %d is %s too small for %d chars\n", *bufLength, totalLength);
         *bufLength = 0;
     }
 }