diff --git a/reactos/ntoskrnl/config/i386/cmhardwr.c b/reactos/ntoskrnl/config/i386/cmhardwr.c
index c550c97431a..96db7f34687 100644
--- a/reactos/ntoskrnl/config/i386/cmhardwr.c
+++ b/reactos/ntoskrnl/config/i386/cmhardwr.c
@@ -446,7 +446,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc
                         }
 
                         /* Null-terminate it */
-                        CpuString[48] = ANSI_NULL;
+                        CpuString[47] = ANSI_NULL;
                     }
                 }
 
diff --git a/reactos/ntoskrnl/include/internal/cm.h b/reactos/ntoskrnl/include/internal/cm.h
index 684d48df8f5..c7494ecf2fd 100644
--- a/reactos/ntoskrnl/include/internal/cm.h
+++ b/reactos/ntoskrnl/include/internal/cm.h
@@ -368,7 +368,7 @@ typedef struct _CM_USE_COUNT_LOG
 typedef struct _CMHIVE
 {
     HHIVE Hive;
-    HANDLE FileHandles[3];
+    HANDLE FileHandles[HFILE_TYPE_MAX];
     LIST_ENTRY NotifyList;
     LIST_ENTRY HiveList;
     EX_PUSH_LOCK HiveLock;