diff --git a/control/common.h b/control/common.h
index 4c4d4acb5bfeecb9bb245122afd1ed6da1272a0d..476c7ff27308b3bf9a1825cab1c77567a1da314c 100644
--- a/control/common.h
+++ b/control/common.h
@@ -119,9 +119,9 @@ void chameleon_pclag2z(CHAM_context_t *chamctxt);
 */
 
 #if defined(__GNUC__)
-static inline int chameleon_asprintf( char **strp, const char *fmt, ... ) __attribute__((format(printf,2,3)));
+static inline int chameleon_asprintf( char **restrict strp, const char *fmt, ... ) __attribute__((format(printf,2,3)));
 #endif
-static inline int chameleon_asprintf( char **strp, const char *fmt, ... )
+static inline int chameleon_asprintf( char **restrict strp, const char *fmt, ... )
 {
     va_list ap;
     int rc;
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index c9a9e3017c11c26ce042ea8ac9c3990d2db1b0c1..6e866ae6940e3e71af1c59b4b87c59476978c71b 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -164,6 +164,7 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
         STARPU_PRIORITY,          options->priority,
         STARPU_CALLBACK,          callback,
         STARPU_EXECUTE_ON_WORKER, options->workerid,
+        STARPU_POSSIBLY_PARALLEL, options->parallel,
 #if defined(CHAMELEON_CODELETS_HAVE_NAME)
         STARPU_NAME,              cl_name,
 #endif
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index 9df9fd08ad4e79cd8017f95a0596eca2e3c872f0..78874feba5e687dda17b9c9170c82a66fc3e5bf5 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -148,6 +148,7 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
     /* Reduce the C access if needed */
     accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
 
+    /* Refine name */
     cl_name = chameleon_codelet_name( cl_name, 2,
                                       A->get_blktile( A, Am, An ),
                                       C->get_blktile( C, Cm, Cn ) );
diff --git a/runtime/starpu/control/runtime_tags.c b/runtime/starpu/control/runtime_tags.c
index ad075ca6a2af61c050970c33ccf64ca72d1b9574..31cc94090a074d7ff6ae05b5d3f187767996ff01 100644
--- a/runtime/starpu/control/runtime_tags.c
+++ b/runtime/starpu/control/runtime_tags.c
@@ -129,8 +129,8 @@ chameleon_starpu_tag_book( int64_t nbtags )
     }
 
 #if defined(CHAMELEON_DEBUG_STARPU)
-    fprintf( stderr, "chameleon_starpu_tag: Book %ld - %ld\n",
-             min, min + nbtags );
+    fprintf( stderr, "[%02d] chameleon_starpu_tag: Book %ld - %ld\n",
+             CHAMELEON_Comm_rank(), min, min + nbtags );
 #endif
 
     assert( cst_first != NULL );