diff --git a/reactos/ntoskrnl/config/cminit.c b/reactos/ntoskrnl/config/cminit.c
index fc8068430cf..46ab61e4b30 100644
--- a/reactos/ntoskrnl/config/cminit.c
+++ b/reactos/ntoskrnl/config/cminit.c
@@ -309,7 +309,7 @@ CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName,
         /* Build the full name */
         FullName.Buffer = NameBuffer;
         FullName.MaximumLength = Length;
-        RtlAppendUnicodeStringToString(&FullName, BaseName);
+        RtlCopyUnicodeString(&FullName, BaseName);
     }
     else
     {
diff --git a/reactos/ntoskrnl/config/cmparse.c b/reactos/ntoskrnl/config/cmparse.c
index c4019a0235e..44525de2c08 100644
--- a/reactos/ntoskrnl/config/cmparse.c
+++ b/reactos/ntoskrnl/config/cmparse.c
@@ -112,7 +112,7 @@ CmpGetSymbolicLink(IN PHHIVE Hive,
     if (!CmpGetValueData(Hive,
                          LinkValue,
                          &ValueLength,
-                         (PVOID)&LinkName,
+                         (PVOID*)&LinkName,
                          &LinkNameAllocated,
                          &CellToRelease))
     {
diff --git a/reactos/sdk/lib/cmlib/cmkeydel.c b/reactos/sdk/lib/cmlib/cmkeydel.c
index ff017b298dd..9baeaa886a7 100644
--- a/reactos/sdk/lib/cmlib/cmkeydel.c
+++ b/reactos/sdk/lib/cmlib/cmkeydel.c
@@ -10,7 +10,7 @@
 
 #include "cmlib.h"
 #define NDEBUG
-#include "debug.h"
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/sdk/lib/cmlib/cmse.c b/reactos/sdk/lib/cmlib/cmse.c
index 66dae931f7b..6b3a8c18b65 100644
--- a/reactos/sdk/lib/cmlib/cmse.c
+++ b/reactos/sdk/lib/cmlib/cmse.c
@@ -10,7 +10,7 @@
 
 #include "cmlib.h"
 #define NDEBUG
-#include "debug.h"
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/sdk/lib/cmlib/cmvalue.c b/reactos/sdk/lib/cmlib/cmvalue.c
index 0d92e219cbf..814dd627611 100644
--- a/reactos/sdk/lib/cmlib/cmvalue.c
+++ b/reactos/sdk/lib/cmlib/cmvalue.c
@@ -180,7 +180,7 @@ CmpValueToData(IN PHHIVE Hive,
     if (!CmpGetValueData(Hive,
                          Value,
                          Length,
-                         (PVOID)&Buffer,
+                         (PVOID*)&Buffer,
                          &BufferAllocated,
                          &CellToRelease))
     {