diff --git a/CloverEFI/OsxBdsDxe/BdsEntry.c b/CloverEFI/OsxBdsDxe/BdsEntry.c
index 66f0f1cf0..f3bd4bd63 100644
--- a/CloverEFI/OsxBdsDxe/BdsEntry.c
+++ b/CloverEFI/OsxBdsDxe/BdsEntry.c
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Hotkey.h"
 #include "HwErrRecSupport.h"
 //#include "CpuDxe.h"
-#include "../Version.h"
+#include "../../Version.h"
 
 #define PERF_DATA_MAX_LENGTH    0x4000
 
diff --git a/CloverEFI/OsxBdsDxe/DeviceMngr/DeviceManager.c b/CloverEFI/OsxBdsDxe/DeviceMngr/DeviceManager.c
index f9c0d79c6..4127507a1 100644
--- a/CloverEFI/OsxBdsDxe/DeviceMngr/DeviceManager.c
+++ b/CloverEFI/OsxBdsDxe/DeviceMngr/DeviceManager.c
@@ -2470,7 +2470,7 @@ GetDriverNameWorker (
                             BestLanguage,
                             DriverName
                             );
-//  FreePool(BestLanguage); // it was not allocated
+  FreePool(BestLanguage); // it was not allocated // Jief : it is allocated by GetBestLanguage from DriverHealthSelectBestLanguage from GetComponentNameWorker
  
   return Status;
 }
diff --git a/CloverEFI/OsxEfiLdr/EfiLoader.c b/CloverEFI/OsxEfiLdr/EfiLoader.c
index 619498073..9af734cff 100644
--- a/CloverEFI/OsxEfiLdr/EfiLoader.c
+++ b/CloverEFI/OsxEfiLdr/EfiLoader.c
@@ -24,7 +24,7 @@ Revision History:
 #include "PeLoader.h"
 #include "LzmaDecompress.h"
 //#include "TianoDecompress.h"
-#include "../Version.h"
+#include "../../Version.h"
 
 EFILDR_LOADED_IMAGE    DxeCoreImage;
 EFILDR_LOADED_IMAGE    DxeIplImage;
diff --git a/FSInject/FSInject.c b/FSInject/FSInject.c
index 2c3b54091..64cf71cad 100644
--- a/FSInject/FSInject.c
+++ b/FSInject/FSInject.c
@@ -33,7 +33,7 @@ Module Name:
 
 #include "FSInject.h"
 
-//#include "../Version.h"
+//#include "../../Version.h"
 //CONST CHAR8* CloverRevision = REVISION_STR;
 
 
diff --git a/MemoryFix/OsxAptioFixDrv/OsxAptioFix2Drv.c b/MemoryFix/OsxAptioFixDrv/OsxAptioFix2Drv.c
index 7ec4a4534..0ef126920 100644
--- a/MemoryFix/OsxAptioFixDrv/OsxAptioFix2Drv.c
+++ b/MemoryFix/OsxAptioFixDrv/OsxAptioFix2Drv.c
@@ -44,7 +44,7 @@
 #define DBG(...)
 #endif
 
-#include "../Version.h"
+#include "../../Version.h"
 CONST CHAR8* CloverRevision = REVISION_STR;
 STATIC UINTN Counter = 0;
 
diff --git a/MemoryFix/OsxAptioFixDrv/OsxAptioFix3Drv.c b/MemoryFix/OsxAptioFixDrv/OsxAptioFix3Drv.c
index 64451d503..ab629a8f7 100644
--- a/MemoryFix/OsxAptioFixDrv/OsxAptioFix3Drv.c
+++ b/MemoryFix/OsxAptioFixDrv/OsxAptioFix3Drv.c
@@ -45,7 +45,7 @@
 #define DBG(...)
 #endif
 
-#include "../Version.h"
+#include "../../Version.h"
 CONST CHAR8* CloverRevision = REVISION_STR;
 STATIC UINTN Counter = 0;
 
diff --git a/MemoryFix/OsxAptioFixDrv/OsxAptioFixDrv.c b/MemoryFix/OsxAptioFixDrv/OsxAptioFixDrv.c
index e54b72ede..00c4863a6 100644
--- a/MemoryFix/OsxAptioFixDrv/OsxAptioFixDrv.c
+++ b/MemoryFix/OsxAptioFixDrv/OsxAptioFixDrv.c
@@ -44,7 +44,7 @@
 	#define DBG(...)
 #endif
 
-#include "../Version.h"
+#include "../../Version.h"
 CONST CHAR8* CloverRevision = REVISION_STR;
 STATIC UINTN Counter = 0;
 
diff --git a/MemoryFix/OsxLowMemFixDrv/OsxLowMemFixDrv.c b/MemoryFix/OsxLowMemFixDrv/OsxLowMemFixDrv.c
index 120986f33..ed1465070 100644
--- a/MemoryFix/OsxLowMemFixDrv/OsxLowMemFixDrv.c
+++ b/MemoryFix/OsxLowMemFixDrv/OsxLowMemFixDrv.c
@@ -40,7 +40,7 @@
 #define DBG(...)
 #endif
 
-#include "../Version.h"
+#include "../../Version.h"
 CONST CHAR8* CloverRevision = REVISION_STR;
 
 
diff --git a/rEFIt_UEFI/Platform/CloverVersion.cpp b/rEFIt_UEFI/Platform/CloverVersion.cpp
index e1ca2c1ef..b4938deb8 100644
--- a/rEFIt_UEFI/Platform/CloverVersion.cpp
+++ b/rEFIt_UEFI/Platform/CloverVersion.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "CloverVersion.h"
-#include "../../../Version.h"
+#include "../../Version.h"
 
 
 
diff --git a/rEFIt_UEFI/cpp_foundation/XArray.h b/rEFIt_UEFI/cpp_foundation/XArray.h
index f52335b30..b13c7c4fb 100755
--- a/rEFIt_UEFI/cpp_foundation/XArray.h
+++ b/rEFIt_UEFI/cpp_foundation/XArray.h
@@ -45,19 +45,12 @@ class XArray
 	void  setSize(size_t l);
 
   //low case functions like in std::vector
-#ifdef JIEF_DEBUG
+
   const TYPE& begin() const { if ( m_len == 0 ) panic("m_len == 0"); return ElementAt(0); }
         TYPE& begin()       { if ( m_len == 0 ) panic("m_len == 0"); return ElementAt(0); }
 
   const TYPE& end() const { if ( m_len == 0 ) panic("m_len == 0"); return ElementAt(m_len - 1); }
         TYPE& end()       { if ( m_len == 0 ) panic("m_len == 0"); return ElementAt(m_len - 1); }
-#else
-        const TYPE& begin() const { if ( m_len == 0 ) return 0; return ElementAt(0); }
-              TYPE& begin()       { if ( m_len == 0 ) return 0; return ElementAt(0); }
-
-        const TYPE& end() const { if ( m_len == 0 ) return 0; return ElementAt(m_len - 1); }
-              TYPE& end()       { if ( m_len == 0 ) return 0; return ElementAt(m_len - 1); }
-#endif
 
   size_t insert(const TYPE newElement, size_t pos, size_t count = 1) { return Insert(newElement, pos, count); }
  
diff --git a/rEFIt_UEFI/cpp_foundation/XBuffer.h b/rEFIt_UEFI/cpp_foundation/XBuffer.h
index ec5261315..d8e0f102e 100755
--- a/rEFIt_UEFI/cpp_foundation/XBuffer.h
+++ b/rEFIt_UEFI/cpp_foundation/XBuffer.h
@@ -57,18 +57,10 @@ protected:
   template<typename IntegralType, enable_if(is_integral(IntegralType))>
   void stealValueFrom(T* p, IntegralType count, IntegralType allocatedSize) {
     if ( count < 0 ) {
-#ifdef JIEF_DEBUG
       panic("XBuffer::stealValueFrom : count < 0. System halted\n");
-#else
-      return;
-#endif
     }
     if ( allocatedSize < count ) {
-#ifdef JIEF_DEBUG
       panic("XBuffer::stealValueFrom : allocatedSize < count. System halted\n");
-#else
-      return;
-#endif
     }
     if( _WData ) free(_WData);
     m_allocatedSize = allocatedSize;