diff --git a/src/lib/eina/eina_cow.c b/src/lib/eina/eina_cow.c
index bd09360084..0ad851d556 100644
--- a/src/lib/eina/eina_cow.c
+++ b/src/lib/eina/eina_cow.c
@@ -31,6 +31,10 @@
 
 #include "eina_cow.h"
 
+#ifndef NVALGRIND
+# include <memcheck.h>
+#endif
+
 #define EINA_COW_MAGIC 0xDEADBEEF
 
 // #define MOO // Define that one if you want magic debug for Eina_Cow_Ptr
diff --git a/src/lib/eina/eina_magic.c b/src/lib/eina/eina_magic.c
index 293421a64c..ee9c9e2ed4 100644
--- a/src/lib/eina/eina_magic.c
+++ b/src/lib/eina/eina_magic.c
@@ -286,7 +286,7 @@ eina_magic_fail(void *d,
    if (m == EINA_MAGIC_NONE)
       eina_log_print(EINA_LOG_DOMAIN_GLOBAL, EINA_LOG_LEVEL_CRITICAL,
                      file, fnc, line,
-                     "*** Eina Magic Check Failed at %d !!!\n"
+                     "*** Eina Magic Check Failed at %p !!!\n"
                      "    Input handle has already been freed!\n"
                      "*** NAUGHTY PROGRAMMER!!!\n"
                      "*** SPANK SPANK SPANK!!!\n"
diff --git a/src/modules/eina/mp/chained_pool/eina_chained_mempool.c b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
index 2da74adb28..e381f556d1 100644
--- a/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
+++ b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -206,12 +206,12 @@ _eina_chained_mempool_alloc_in(Chained_Mempool *pool, Chained_Pool *p)
 static Eina_Bool
 _eina_chained_mempool_free_in(Chained_Mempool *pool, Chained_Pool *p, void *ptr)
 {
+#ifdef DEBUG
    void *pmem;
   
    // pool mem base
    pmem = (void *)(((unsigned char *)p) + sizeof(Chained_Pool));
 
-#ifdef DEBUG
    // is it in pool mem?
    if (ptr < pmem)
      {