diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c
index d06751c6447057e5e799db98a9b65bbc28acdaf4..94031382b27187c4ee6ccf1bfa7738ae8f0f703d 100644
--- a/runtime/starpu/control/runtime_control.c
+++ b/runtime/starpu/control/runtime_control.c
@@ -300,11 +300,11 @@ void RUNTIME_barrier( CHAM_context_t *chamctxt )
 
 #if defined(CHAMELEON_USE_MPI)
 #  if defined(HAVE_STARPU_MPI_WAIT_FOR_ALL)
-    starpu_mpi_wait_for_all(chamctxt->comm);
-    starpu_mpi_barrier(chamctxt->comm);
+    starpu_mpi_wait_for_all( chamctxt->comm );
+    starpu_mpi_barrier( chamctxt->comm );
 #  else
     starpu_task_wait_for_all();
-    starpu_mpi_barrier(chamctxt->comm);
+    starpu_mpi_barrier( chamctxt->comm );
 #  endif
 #else
     starpu_task_wait_for_all();
@@ -386,6 +386,7 @@ int RUNTIME_comm_rank( CHAM_context_t *chamctxt )
 #  endif
 #endif
 
+    (void)chamctxt;
     return rank;
 }
 
@@ -405,6 +406,7 @@ int RUNTIME_comm_size( CHAM_context_t *chamctxt )
     size = 1;
 #endif
 
+    (void)chamctxt;
     return size;
 }