diff --git a/windows/peloader.c b/windows/peloader.c
index cc89a33a391..fdbb21d3c91 100644
--- a/windows/peloader.c
+++ b/windows/peloader.c
@@ -106,8 +106,14 @@ WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock,
 	ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(ScanDTE->DllBase),
 		TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize);
 
-	DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable(): %S ImportTable = 0x%X\n",
-		VaToPa(ScanDTE->BaseDllName.Buffer),ImportTable));
+	{
+		UNICODE_STRING BaseName;
+		BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer);
+		BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength;
+		BaseName.Length = ScanDTE->BaseDllName.Length;
+		DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n",
+			&BaseName, ImportTable));
+	}
 
 	/* If image doesn't have any import directory - just return success */
 	if (ImportTable == NULL)
diff --git a/windows/winldr.c b/windows/winldr.c
index 48bff471c90..8252002c847 100644
--- a/windows/winldr.c
+++ b/windows/winldr.c
@@ -29,9 +29,6 @@ extern ULONG reactos_disk_count;
 extern ARC_DISK_SIGNATURE reactos_arc_disk_info[];
 extern char reactos_arc_strings[32][256];
 
-ARC_DISK_SIGNATURE BldrDiskInfo[32];
-CHAR BldrArcNames[32][256];
-
 BOOLEAN
 WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock,
                         IN PCH DllName,
@@ -138,7 +135,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
 		PARC_DISK_SIGNATURE ArcDiskInfo;
 
 		/* Get the ARC structure */
-		ArcDiskInfo = (PARC_DISK_SIGNATURE)MmHeapAlloc(sizeof(ARC_DISK_SIGNATURE));//&BldrDiskInfo[i];
+		ArcDiskInfo = (PARC_DISK_SIGNATURE)MmHeapAlloc(sizeof(ARC_DISK_SIGNATURE));
 		RtlZeroMemory(ArcDiskInfo, sizeof(ARC_DISK_SIGNATURE));
 
 		/* Copy the data over */
@@ -146,9 +143,9 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
 		ArcDiskInfo->CheckSum = reactos_arc_disk_info[i].CheckSum;
 
 		/* Copy the ARC Name */
-		//ArcDiskInfo->ArcName = (PCHAR)MmAllocateMemory(sizeof(CHAR)*256);
-		strcpy(BldrArcNames[i], reactos_arc_disk_info[i].ArcName);
-		ArcDiskInfo->ArcName = (PCHAR)PaToVa(BldrArcNames[i]);
+		ArcDiskInfo->ArcName = (PCHAR)MmHeapAlloc(sizeof(CHAR)*256);
+		strcpy(ArcDiskInfo->ArcName, reactos_arc_disk_info[i].ArcName);
+		ArcDiskInfo->ArcName = (PCHAR)PaToVa(ArcDiskInfo->ArcName);
 
 		/* Mark partition table as valid */
 		ArcDiskInfo->ValidPartitionTable = TRUE; 
@@ -534,7 +531,6 @@ WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock)
 	{
 		MemoryDescriptor = CONTAINING_RECORD(NextMd, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry);
 
-
 		DbgPrint((DPRINT_WINDOWS, "BP %08X PC %04X MT %d\n", MemoryDescriptor->BasePage,
 			MemoryDescriptor->PageCount, MemoryDescriptor->MemoryType));