diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c
index 019a4f802169eacae0a9dc116e620aa7128d84dd..d88d1224dc5fc0ae1ca557a89e42107ad4e530ce 100644
--- a/sdk/lib/rtl/heap.c
+++ b/sdk/lib/rtl/heap.c
@@ -1418,6 +1418,8 @@ RtlCreateHeap(ULONG Flags,
     NTSTATUS Status;
     ULONG MaxBlockSize;
 
+    RtlpPageHeapEnabled = TRUE;
+
     /* Check for a special heap */
     if (RtlpPageHeapEnabled && !Addr && !Lock)
     {
@@ -1438,6 +1440,8 @@ RtlCreateHeap(ULONG Flags,
         Flags &= HEAP_CREATE_VALID_MASK;
     }
 
+    if (!Addr) Flags |= HEAP_FLAG_PAGE_ALLOCS;
+
     /* Capture parameters */
     if (Parameters)
     {
diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c
index fc98cccd430efdc5e11cae6065c9d407946649cb..03ed8c3d224b4f3491d7c8b94b734a4aa130f54e 100644
--- a/ntoskrnl/ex/init.c
+++ b/ntoskrnl/ex/init.c
@@ -1059,7 +1059,7 @@ ExpInitializeExecutive(IN ULONG Cpu,
     /* Set global flags for the checked build */
 #if DBG
     NtGlobalFlag |= FLG_ENABLE_CLOSE_EXCEPTIONS |
-                    FLG_ENABLE_KDEBUG_SYMBOL_LOAD;
+                    FLG_ENABLE_KDEBUG_SYMBOL_LOAD | FLG_STOP_ON_EXCEPTION;
 #endif
 
     /* Setup NT System Root Path */
diff --git a/dll/win32/setupapi/parser.c b/dll/win32/setupapi/parser.c
index d5e83a481ac8824889a073448d7a0e71f7acfd70..1b5692dac992f2eb4faabaa6e7256a2566ca5018 100644
--- a/dll/win32/setupapi/parser.c
+++ b/dll/win32/setupapi/parser.c
@@ -2,7 +2,7 @@
  * INF file parsing
  *
  * Copyright 2002 Alexandre Julliard for CodeWeavers
- *           2005-2006 Herv� Poussineau (hpoussin@reactos.org)
+ *           2005-2006 Hervé Poussineau (hpoussin@reactos.org)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -1633,7 +1633,10 @@ BOOL WINAPI SetupFindNextLine( PINFCONTEXT context_in, PINFCONTEXT context_out )
     struct inf_file *file = context_in->CurrentInf;
     struct section *section;
 
-    if (context_in->Section >= file->nb_sections) goto error;
+    UINT sect_nr = context_in->Section;
+    UINT nb_sect = file->nb_sections;
+
+    if (sect_nr >= nb_sect) goto error;
 
     section = file->sections[context_in->Section];
     if (context_in->Line+1 < section->nb_lines)