diff --git a/.gitignore b/.gitignore
index 708b6b20..c1f684cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@ Utilities/TestBmf/Bmf
 Utilities/TestDiskImage/DiskImage
 Utilities/TestHelloWorld/HelloWorld
 Utilities/TestImg4/Img4
-Utilities/TestKernelCollection/KernelCollection
+Utilities/TestKernelCollection2/KernelCollection2
 Utilities/TestKextInject/KextInject
 Utilities/TestKextInject/Result.xml
 Utilities/TestMacho/Macho
diff --git a/Library/OcAppleKernelLib/PrelinkedContext.c b/Library/OcAppleKernelLib/PrelinkedContext.c
index 2ed1f04a..9e808e46 100644
--- a/Library/OcAppleKernelLib/PrelinkedContext.c
+++ b/Library/OcAppleKernelLib/PrelinkedContext.c
@@ -592,7 +592,7 @@ PrelinkedInjectComplete (
     ASSERT (ChainSize <= Context->KextsFixupChains->Size);
 
     Context->KextsFixupChains->Size      = ChainSize;
-    Context->KextsFixupChains->PageCount = KextsSize / MACHO_PAGE_SIZE;
+    Context->KextsFixupChains->PageCount = (UINT16) (KextsSize / MACHO_PAGE_SIZE);
 
     Status = KcRebuildMachHeader (Context);
     if (EFI_ERROR (Status)) {
diff --git a/Library/OcXmlLib/OcXmlLib.c b/Library/OcXmlLib/OcXmlLib.c
index ef7f1fff..f6c178bd 100755
--- a/Library/OcXmlLib/OcXmlLib.c
+++ b/Library/OcXmlLib/OcXmlLib.c
@@ -1550,6 +1550,10 @@ PlistIntegerValue (
     ++TempStr;
   }
 
+  if (Hex && TempStr[0] != '0' && TempStr[1] != 'x') {
+    Hex = FALSE;
+  }
+
   if (Hex) {
     Temp = AsciiStrHexToUint64 (TempStr);
   } else {
diff --git a/Utilities/TestKernelCollection2/KernelCollection2 b/Utilities/TestKernelCollection2/KernelCollection2
deleted file mode 100755
index 28827a80..00000000
Binary files a/Utilities/TestKernelCollection2/KernelCollection2 and /dev/null differ
diff --git a/Utilities/TestKernelCollection2/KernelCollection2.c b/Utilities/TestKernelCollection2/KernelCollection2.c
index 78cb745b..b4c07002 100644
--- a/Utilities/TestKernelCollection2/KernelCollection2.c
+++ b/Utilities/TestKernelCollection2/KernelCollection2.c
@@ -124,6 +124,9 @@ int main(int argc, char** argv) {
   UINT32 AllocSize;
   PRELINKED_CONTEXT Context;
 
+  PcdGet32 (PcdFixedDebugPrintErrorLevel) |= DEBUG_INFO;
+  PcdGet32 (PcdDebugPrintErrorLevel)      |= DEBUG_INFO;
+
   if ((Prelinked = readFile(argc > 1 ? argv[1] : "/System/Library/KernelCollections/BootKernelExtensions.kc", &PrelinkedSize)) == NULL) {
     printf("Read fail\n");
     return -1;