diff --git a/src/bootloader.c b/src/bootloader.c
index 34ac507..4a6f15f 100644
--- a/src/bootloader.c
+++ b/src/bootloader.c
@@ -974,7 +974,7 @@ EFI_STATUS LoadKernel(EFI_HANDLE ImageHandle, GFX_INFO* Graphics, EFI_CONFIGURAT
 			AwaitKey(L"\0");
 #endif
 
-			KernelStatus = IMAGE_FILE_EXECUTABLE_IMAGE;
+			KernelStatus = DOS_EXECUTABLE;
 			Print(L"\r\n Error 0x%llx: This file cannot be run in UEFI mode.\r\n", KernelStatus);
 			return KernelStatus;
 		}
diff --git a/src/gfx.c b/src/gfx.c
index 46e9f74..8f75973 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -129,6 +129,7 @@ EFI_STATUS InitGfx(EFI_HANDLE ImageHandle, GFX_INFO* Graphics) {
 #ifdef GFX_DEBUG_NAMING
 	Print(L"Number of NAME2 handles: %llu\r\n", NumName2Handles);
 	Print(L"Number of Device Path handles: %llu\r\n", NumDevicePathHandles);
+	AwaitKey(L"\0");
 #endif
 
 	for (DeviceInd = 0; DeviceInd < NumGfxHandles; DeviceInd++) {
@@ -283,7 +284,7 @@ EFI_STATUS InitGfx(EFI_HANDLE ImageHandle, GFX_INFO* Graphics) {
 						{
 
 #ifdef GFX_DEBUG_NAMING
-							Print(L"Name2Device GetController ChildName error: 0x%llu\r\n", GfxStatus);
+							Print(L"Name2Device GetController ChildName error: 0x%llx\r\n", GfxStatus);
 #endif
 							ChildDisplayName = DefaultChildName;
 						}
@@ -483,7 +484,7 @@ EFI_STATUS InitGfx(EFI_HANDLE ImageHandle, GFX_INFO* Graphics) {
 			 // CatPrint solves an edgecase in GNU-EFI relating to an off-by-one error.
 
 			POOL_PRINT StringName = { 0 };
-			CatPrint(&StringName, L"%c. %s: %s @ Memory Address 0xllx, using %s\r\n", DeviceInd + 0x30 /* Shift into the ASCII numbers */, ControllerDisplayName, ChildDisplayName, GraphicsHandles[DeviceInd], DriverDisplayName);
+			CatPrint(&StringName, L"%c. %s: %s @ Memory Address 0x%llx, using %s\r\n", DeviceInd + 0x30 /* Shift into the ASCII numbers */, ControllerDisplayName, ChildDisplayName, GraphicsHandles[DeviceInd], DriverDisplayName);
 			NameBuffer[DeviceInd] = StringName.str;
 
 #ifdef GFX_DEBUG_NAMING