diff --git a/dbtest.patch b/dbtest.patch
index 68c653d..eb8086e 100644
--- a/dbtest.patch
+++ b/dbtest.patch
@@ -24,7 +24,7 @@ diff -Naur acpica-unix2-20200214.orig/source/components/debugger/dbtest.c acpica
      /* Write a new value */
  
 +    ValueToWrite = AcpiOsAllocateZeroed(strlen(TestStr)+1);
-+    strncpy(ValueToWrite, TestStr, strlen(TestStr));
++    strncpy(ValueToWrite, TestStr, strlen(TestStr)+1);
 +
      WriteValue.Type = ACPI_TYPE_STRING;
      WriteValue.String.Length = strlen (ValueToWrite);
diff --git a/utstring.patch b/utstring.patch
index 757fc2a..626042c 100644
--- a/utstring.patch
+++ b/utstring.patch
@@ -6,7 +6,7 @@ diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utstring.c acp
      UINT32                  i;
      BOOLEAN                 FoundBadChar = FALSE;
 -    UINT32                  OriginalName;
-+    char                    OriginalName[ACPI_NAMESEG+SIZE+1];
++    char                    OriginalName[ACPI_NAMESEG_SIZE+1];
  
  
      ACPI_FUNCTION_NAME (UtRepairName);
@@ -15,14 +15,14 @@ diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utstring.c acp
              ACPI_WARNING ((AE_INFO,
                  "Invalid character(s) in name (0x%.8X), repaired: [%4.4s]",
 -                OriginalName, Name));
-+                (unsigned int)OriginalName, Name));
++                (unsigned int)*OriginalName, Name));
          }
          else
          {
              ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
                  "Invalid character(s) in name (0x%.8X), repaired: [%4.4s]",
 -                OriginalName, Name));
-+                (unsigned int)OriginalName, Name));
++                (unsigned int)*OriginalName, Name));
          }
      }
  }