diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c
index e696248a40b0e8e6a4b45c56b82c9c827b32e0ae..e53cda3479a7e5c12834db468e95225a89fe6efb 100644
--- a/runtime/parsec/control/runtime_descriptor.c
+++ b/runtime/parsec/control/runtime_descriptor.c
@@ -21,7 +21,6 @@
 #include "chameleon_parsec.h"
 #include <parsec/data.h>
 #include <parsec/datatype.h>
-//#include <parsec/data_dist/matrix/matrix.h>
 #include <parsec/arena.h>
 
 static int parsec_global_arena_index = 0;
@@ -250,7 +249,7 @@ void RUNTIME_desc_create( MORSE_desc_t *mdesc )
     parsec_dtd_taskpool_new();
     /* Internal limitation of PaRSEC */
     assert(parsec_global_arena_index < 16);
-    pdesc->arena_index = parsec_global_arena_index++;
+    pdesc->arena_index = 0; /*parsec_global_arena_index++;*/
 
     parsec_datatype_t datatype;
     switch(mdesc->dtyp) {
diff --git a/runtime/parsec/include/chameleon_parsec.h b/runtime/parsec/include/chameleon_parsec.h
index b7cafbcf2f165d1c07baf45fe9cc4652f2ea120a..f33ac9b34b34edab94cead94bab20293ba4d1ee2 100644
--- a/runtime/parsec/include/chameleon_parsec.h
+++ b/runtime/parsec/include/chameleon_parsec.h
@@ -22,6 +22,10 @@
 
 #include <parsec.h>
 #include <parsec/insert_function.h>
+#include <parsec/data_dist/matrix/matrix.h>
+
+/* Undefined PaRSEC definition of BLKLDD */
+#undef BLKLDD
 
 #include "control/common.h"