diff --git a/rEFIt_UEFI/Platform/guid.cpp b/rEFIt_UEFI/Platform/guid.cpp
index e604c23a7..c51fcbd3b 100644
--- a/rEFIt_UEFI/Platform/guid.cpp
+++ b/rEFIt_UEFI/Platform/guid.cpp
@@ -96,6 +96,8 @@ EFI_PART_TYPE_LEGACY_MBR_GUID {0x024DEE41, 0x33E7, 0x11D3, {0x9D, 0x69, 0x00, 0x
 // B295BD1C-63E3-48E3-B265-F7DFA2070123 - success
 // 82ED9A9E-CCBB-4CD2-8A94-F4E3559AF911 - Gibraltar
 
+// ->LocateProtocol(3496A19A-2E99-41BA-833E-0FDE2EBF2A55, 0, 0/0) = Not Found
+// ->LocateProtocol(8555FD40-140B-4F3C-905E-3BF378A099FA, 0, 0/0) = Not Found
 
 /**
   Apple Debug Log protocol GUID.
diff --git a/rEFIt_UEFI/Platform/guid.h b/rEFIt_UEFI/Platform/guid.h
index 84325a0fa..031c55992 100644
--- a/rEFIt_UEFI/Platform/guid.h
+++ b/rEFIt_UEFI/Platform/guid.h
@@ -318,7 +318,7 @@ EFI_PART_TYPE_LEGACY_MBR_GUID {0x024DEE41, 0x33E7, 0x11D3, {0x9D, 0x69, 0x00, 0x
 // 00 00 08 00 00 00 00 00                         | ........
 // gAppleFpfConfigurationHobGuid  = { 0xE3CC8EC6, 0x81C1, 0x4271, { 0xAC, 0xBC, 0xDB, 0x65, 0x08, 0x6E, 0x8D, 0xC8 }}
 // 59D76AE4-37E3-55A7-B460-EF13D46E6020 AppleEncryptedPartitionProtocolGuid
-// ->LocateProtocol(3496A19A-2E99-41BA-833E-0FDE2EBF2A55, 0, 0/0) = Not Found
+
 /*
 #define APPLE_SECURE_BOOT_VARIABLE_GUID  \
 { 0x94B73556, 0x2197, 0x4702,          \
diff --git a/rEFIt_UEFI/libeg/AppleImageCodec.cpp b/rEFIt_UEFI/libeg/AppleImageCodec.cpp
index f891482de..3cb4eae5d 100644
--- a/rEFIt_UEFI/libeg/AppleImageCodec.cpp
+++ b/rEFIt_UEFI/libeg/AppleImageCodec.cpp
@@ -22,8 +22,8 @@
 //#include "picopng.h"
 #include "lodepng.h"
 
-//#define DBG(...) DebugLog(1, __VA_ARGS__)
-#define DBG(...)
+#define DBG(...) DebugLog(1, __VA_ARGS__)
+//#define DBG(...)
 
 struct EFI_RES_ENTRY {
   CHAR8 Name[64];
@@ -133,7 +133,7 @@ GetImageDims (//IN APPLE_IMAGE_CODEC_PROTOCOL* This,
   *ImageHeight = (UINT32)Image.GetHeight();
   
   DBG("EFI_SUCCESS, Width=%d, Height=%d\n", *ImageWidth, *ImageHeight);
-  DBG("ImageSize=%lld\n", ImageSize);
+//  DBG("ImageSize=%lld\n", ImageSize);
   return EFI_SUCCESS;
 }
 
diff --git a/rEFIt_UEFI/libeg/load_icns.cpp b/rEFIt_UEFI/libeg/load_icns.cpp
index 9ae3310e1..2bee03842 100644
--- a/rEFIt_UEFI/libeg/load_icns.cpp
+++ b/rEFIt_UEFI/libeg/load_icns.cpp
@@ -99,7 +99,7 @@ void egDecompressIcnsRLE(IN OUT UINT8 **CompData, IN OUT UINTN *CompLen, IN UINT
     UINT8 *cp;
     UINT8 *cp_end;
     UINT8 *pp;
-    UINTN pp_left;
+    INTN pp_left;
     UINTN len;
     UINT8 value;
     
@@ -114,7 +114,7 @@ void egDecompressIcnsRLE(IN OUT UINT8 **CompData, IN OUT UINTN *CompLen, IN UINT
         len = *cp++;
         if (len & 0x80) {   // compressed data: repeat next byte
             len -= 125;
-            if (len > pp_left)
+            if (len > (UINTN)pp_left)
                 break;
             value = *cp++;
             for (UINTN i = 0; i < len; i++) {
@@ -123,14 +123,14 @@ void egDecompressIcnsRLE(IN OUT UINT8 **CompData, IN OUT UINTN *CompLen, IN UINT
             }
         } else {            // uncompressed data: copy bytes
             len++;
-            if (len > pp_left || cp + len > cp_end)
+            if (len > (UINTN)pp_left || cp + len > cp_end)
                 break;
             for (UINTN i = 0; i < len; i++) {
                 *pp = *cp++;
                 pp += 4;
             }
         }
-        pp_left -= len;
+        pp_left -= (INTN)len;
     }
     
   if (pp_left > 0) {
diff --git a/rEFIt_UEFI/libeg/nanosvg.h b/rEFIt_UEFI/libeg/nanosvg.h
index 3f5dc6cd9..0a860f8f9 100644
--- a/rEFIt_UEFI/libeg/nanosvg.h
+++ b/rEFIt_UEFI/libeg/nanosvg.h
@@ -51,12 +51,20 @@ extern "C" {
 #define NANOSVG_ALL_COLOR_KEYWORDS 1
 #define NSVG_RGBA(r, g, b, a) (((unsigned int)b) | ((unsigned int)g << 8) | ((unsigned int)r << 16) | ((unsigned int)a << 24))
 
-#define kMaxIDLength 64
-#define kMaxTextLength 256
+//#define kMaxIDLength 64
+//#define kMaxTextLength 256
+//
+//
+//#define NSVG_MAX_ATTR 2048
+//#define NSVG_MAX_CLIP_PATHS 1024 // also note NSVGclipPathIndex
+
+const int kMaxIDLength = 64;
+const int kMaxTextLength  = 256;
 
 
-#define NSVG_MAX_ATTR 2048
-#define NSVG_MAX_CLIP_PATHS 1024 // also note NSVGclipPathIndex
+const int NSVG_MAX_ATTR = 2048;
+const int NSVG_MAX_CLIP_PATHS = 1024;  // also note NSVGclipPathIndex
+
 
 #ifdef JIEF_DEBUG
 #define NANOSVG_MEMORY_ALLOCATION_TRACE