diff --git a/example/lapack_to_morse/step6.c b/example/lapack_to_morse/step6.c
index 325a0fd8b6c0b1325181187070225a9c4352de4b..51261b6c4aac4918d1704e24e395c7cfa5cc3a50 100644
--- a/example/lapack_to_morse/step6.c
+++ b/example/lapack_to_morse/step6.c
@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
     MORSE_Set(MORSE_INNER_BLOCK_SIZE, iparam[IPARAM_IB] );
 
 #if defined(CHAMELEON_USE_MPI)
-    MORSE_Comm_size( &NMPIPROC );
+    NMPIPROC = MORSE_Comm_size();
     /* Check P */
     if ( (iparam[IPARAM_P] > 1) &&
          (NMPIPROC % iparam[IPARAM_P] != 0) ) {
diff --git a/example/lapack_to_morse/step7.c b/example/lapack_to_morse/step7.c
index 378123abd731258c7ec8e15d994bdc8f3273b709..b9c0f9117ac2b3e66f2d0942fe4067c1495d2981 100644
--- a/example/lapack_to_morse/step7.c
+++ b/example/lapack_to_morse/step7.c
@@ -107,7 +107,7 @@ int main(int argc, char *argv[]) {
     MORSE_Set(MORSE_INNER_BLOCK_SIZE, iparam[IPARAM_IB] );
 
 #if defined(CHAMELEON_USE_MPI)
-    MORSE_Comm_size( &NMPIPROC );
+    NMPIPROC = MORSE_Comm_size();
     /* Check P */
     if ( (iparam[IPARAM_P] > 1) &&
          (NMPIPROC % iparam[IPARAM_P] != 0) ) {
diff --git a/include/chameleon/chameleon_config.h.in b/include/chameleon/chameleon_config.h.in
index b1d6abb133ee925ed100228dc1a6d0766086d938..b2ea05211ee2b607e065ab95de15f17e549cd787 100644
--- a/include/chameleon/chameleon_config.h.in
+++ b/include/chameleon/chameleon_config.h.in
@@ -25,10 +25,6 @@
 #ifndef CHAMELEON_CONFIG_H_HAS_BEEN_INCLUDED
 #define CHAMELEON_CONFIG_H_HAS_BEEN_INCLUDED
 
-#define MORSE_VERSION_MAJOR @MORSE_VERSION_MAJOR@
-#define MORSE_VERSION_MINOR @MORSE_VERSION_MINOR@
-#define MORSE_VERSION_MICRO @MORSE_VERSION_MICRO@
-
 #define CHAMELEON_VERSION_MAJOR @CHAMELEON_VERSION_MAJOR@
 #define CHAMELEON_VERSION_MINOR @CHAMELEON_VERSION_MINOR@
 #define CHAMELEON_VERSION_MICRO @CHAMELEON_VERSION_MICRO@
diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c
index aec18aa50cb8c162f655fc3af0a89f65d5a9b7d3..deba03a2cea99bb8ad5b357f5d1be9d14a7dabc5 100644
--- a/runtime/starpu/control/runtime_control.c
+++ b/runtime/starpu/control/runtime_control.c
@@ -107,8 +107,8 @@ int RUNTIME_init( MORSE_context_t *morse,
         MPI_Initialized( &flag );
 #endif
         starpu_mpi_init(NULL, NULL, !flag);
-        RUNTIME_comm_rank(&(morse->my_mpi_rank));
-        RUNTIME_comm_size(&(morse->mpi_comm_size));
+        morse->my_mpi_rank = RUNTIME_comm_rank( morse );
+        morse->mpi_comm_size = RUNTIME_comm_size( morse );
     }
 #endif
 
diff --git a/timing/timing.c b/timing/timing.c
index d054b1ef7a81419cdf75d77e2673b80ffac0f374..22015352bfca981f9bd2e81f72fd9713ef92316d 100644
--- a/timing/timing.c
+++ b/timing/timing.c
@@ -687,7 +687,7 @@ main(int argc, char *argv[]) {
         MORSE_Enable(MORSE_GEMM3M);
 
 #if defined(CHAMELEON_USE_MPI)
-    MORSE_Comm_size( &nbnode );
+    nbnode = MORSE_Comm_size();
     iparam[IPARAM_NMPI] = nbnode;
     /* Check P */
     if ( (iparam[IPARAM_P] > 1) &&