Index: boot/bootdata/hivesys_amd64.inf
===================================================================
--- boot/bootdata/hivesys_amd64.inf	(revision 50568)
+++ boot/bootdata/hivesys_amd64.inf	(working copy)
@@ -886,6 +886,7 @@
 ; Session Manager stuff
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \
  "autocheck autochk *"
+HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003, 0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \
  "\Windows", \
  "\RPC Control"
Index: boot/bootdata/hivesys_arm.inf
===================================================================
--- boot/bootdata/hivesys_arm.inf	(revision 50568)
+++ boot/bootdata/hivesys_arm.inf	(working copy)
@@ -740,6 +740,7 @@
 ; Session Manager stuff
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \
  "autocheck autochk *"
+HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003, 0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \
  "\Windows", \
  "\RPC Control"
Index: boot/bootdata/hivesys_i386.inf
===================================================================
--- boot/bootdata/hivesys_i386.inf	(revision 50568)
+++ boot/bootdata/hivesys_i386.inf	(working copy)
@@ -979,6 +979,7 @@
 ; Session Manager stuff
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \
  "autocheck autochk *"
+HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003, 0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \
  "\Windows", \
  "\RPC Control"
Index: ntoskrnl/config/cmdata.c
===================================================================
--- ntoskrnl/config/cmdata.c	(revision 50568)
+++ ntoskrnl/config/cmdata.c	(working copy)
@@ -16,7 +16,7 @@
 /* GLOBALS *******************************************************************/
 
 ULONG DummyData;
-ULONG CmNtGlobalFlag;
+extern ULONG NtGlobalFlag;
 extern ULONG MmProductType;
 
 WCHAR CmDefaultLanguageId[12];
@@ -213,7 +213,7 @@
     {
         L"Session Manager",
         L"GlobalFlag",
-        &CmNtGlobalFlag,
+        &NtGlobalFlag,
         NULL,
         NULL
     },
Index: ntoskrnl/ex/init.c
===================================================================
--- ntoskrnl/ex/init.c	(revision 50568)
+++ ntoskrnl/ex/init.c	(working copy)
@@ -1021,12 +1021,6 @@
     /* Clear the crypto exponent */
     SharedUserData->CryptoExponent = 0;
 
-    /* Set global flags for the checked build */
-#if DBG
-    NtGlobalFlag |= FLG_ENABLE_CLOSE_EXCEPTIONS |
-                    FLG_ENABLE_KDEBUG_SYMBOL_LOAD;
-#endif
-
     /* Setup NT System Root Path */
     sprintf(Buffer, "C:%s", LoaderBlock->NtBootPathName);
 
@@ -1049,6 +1043,12 @@
     /* Setup initial system settings */
     CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector);
 
+    /* Set global flags for the checked build */
+#if DBG
+    NtGlobalFlag |= FLG_ENABLE_CLOSE_EXCEPTIONS |
+                    FLG_ENABLE_KDEBUG_SYMBOL_LOAD;
+#endif
+
     /* Load static defaults for Service Pack 1 and add our SVN revision */
     CmNtCSDVersion = 0x100 | (KERNEL_VERSION_BUILD_HEX << 16);
     CmNtCSDReleaseType = 0;