diff --git a/base/setup/lib/registry.c b/base/setup/lib/registry.c
index bc97489da00..6c02869a282 100644
--- a/base/setup/lib/registry.c
+++ b/base/setup/lib/registry.c
@@ -1048,7 +1048,10 @@ RegCleanupRegistry(
             Status = DisconnectRegistry(NULL,
                                         RegistryHives[i].HiveRegistryPath,
                                         1 /* REG_FORCE_UNLOAD */);
-            DPRINT1("Unmounting '%S' %s\n", RegistryHives[i].HiveRegistryPath, NT_SUCCESS(Status) ? "succeeded" : "failed");
+            if (!NT_SUCCESS(Status))
+            {
+                DPRINT1("Unmounting '%S' failed\n", RegistryHives[i].HiveRegistryPath);
+            }
 
             /* Switch the hive state to 'Update' */
             RegistryHives[i].State = Update;
diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c
index 20a6bd4b8d5..2d1c4e1c349 100644
--- a/base/setup/lib/settings.c
+++ b/base/setup/lib/settings.c
@@ -809,7 +809,7 @@ ProcessDisplayRegistry(
     }
 
     ASSERT(wcslen(ServiceName) < 10);
-    DPRINT1("Service name: '%S'\n", ServiceName);
+    DPRINT("Service name: '%S'\n", ServiceName);
 
     RtlStringCchPrintfW(RegPath, ARRAYSIZE(RegPath),
                         L"System\\CurrentControlSet\\Services\\%s",
@@ -853,7 +853,7 @@ ProcessDisplayRegistry(
     RtlStringCchPrintfW(RegPath, ARRAYSIZE(RegPath),
                         L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0",
                         ServiceName);
-    DPRINT1("RegPath: '%S'\n", RegPath);
+    DPRINT("RegPath: '%S'\n", RegPath);
     RtlInitUnicodeString(&KeyName, RegPath);
     InitializeObjectAttributes(&ObjectAttributes,
                                &KeyName,
diff --git a/base/setup/lib/utils/inicache.c b/base/setup/lib/utils/inicache.c
index e6b2895ab0d..c38b618dcf2 100644
--- a/base/setup/lib/utils/inicache.c
+++ b/base/setup/lib/utils/inicache.c
@@ -497,7 +497,7 @@ IniCacheLoadFromMemory(
                                          &SectionName,
                                          &SectionNameSize);
 
-            DPRINT1("[%.*s]\n", SectionNameSize, SectionName);
+            DPRINT("[%.*s]\n", SectionNameSize, SectionName);
 
             Section = IniCacheAddSection(*Cache,
                                          SectionName,
@@ -526,7 +526,7 @@ IniCacheLoadFromMemory(
                                       &KeyValueSize,
                                       String);
 
-            DPRINT1("'%.*s' = '%.*s'\n", KeyNameSize, KeyName, KeyValueSize, KeyValue);
+            DPRINT("'%.*s' = '%.*s'\n", KeyNameSize, KeyName, KeyValueSize, KeyValue);
 
             Key = IniCacheAddKey(Section,
                                  KeyName,
diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c
index 83ad8e0317f..aee3c3c161a 100644
--- a/base/setup/lib/utils/partlist.c
+++ b/base/setup/lib/utils/partlist.c
@@ -3032,7 +3032,7 @@ CheckActiveSystemPartition(
         return;
     }
 
-    DPRINT1("We are here (1)!\n");
+    DPRINT("We are here (1)!\n");
 
     List->SystemPartition = NULL;
     List->OriginalSystemPartition = NULL;
@@ -3070,7 +3070,7 @@ CheckActiveSystemPartition(
         DPRINT1("NewDisk TRUE but first partition is used?\n");
     }
 
-    DPRINT1("We are here (2)!\n");
+    DPRINT("We are here (2)!\n");
 
     /*
      * The disk is not new, check if any partition is initialized;
@@ -3111,7 +3111,7 @@ CheckActiveSystemPartition(
     List->SystemPartition = NULL;
     List->OriginalSystemPartition = NULL;
 
-    DPRINT1("We are here (3)!\n");
+    DPRINT("We are here (3)!\n");
 
     /* The disk is not new, scan all partitions to find the (active) system partition */
     for (ListEntry = DiskEntry->PrimaryPartListHead.Flink;