diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index 8c652200e8ba0f3eb2e752a257a6917ac8b989b0..d05ff0b3e85b6eb44dfa54bd54d7072d99187983 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -84,8 +84,9 @@ void INSERT_TASK_zgeadd( const RUNTIME_option_t *options,
                          CHAMELEON_Complex64_t beta,  const CHAM_desc_t *B, int Bm, int Bn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, B, Bm, Bn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, B, Bm, Bn );
+        return;
     }
 
     struct starpu_codelet *codelet = &cl_zgeadd;
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 9e1574d7abd7fe95b0c47904aa44f83744f0e9a1..726c01f4715c84050fc5a01171ba9577dc34f602 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -104,8 +104,9 @@ void INSERT_TASK_zgemm_Astat( const RUNTIME_option_t *options,
                               CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zgemm_args_s  *clargs = NULL;
@@ -191,8 +192,9 @@ void INSERT_TASK_zgemm( const RUNTIME_option_t *options,
                         CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zgemm_args_s  *clargs = NULL;
diff --git a/runtime/starpu/codelets/codelet_zgersum.c b/runtime/starpu/codelets/codelet_zgersum.c
index b3cfebbd93d958e206b56907cb42bb3ebaec6df5..9682c03fb666414f98bb1b6ed104eee3f78ad519 100644
--- a/runtime/starpu/codelets/codelet_zgersum.c
+++ b/runtime/starpu/codelets/codelet_zgersum.c
@@ -36,6 +36,7 @@ cl_zgersum_redux_cpu_func( void *descr[], void *cl_arg )
 
     TCORE_zgeadd( ChamNoTrans, tileA->m, tileA->n, 1., tileB, 1., tileA );
 
+    (void)cl_arg;
     return;
 }
 
@@ -59,6 +60,7 @@ cl_zgersum_redux_cuda_func( void *descr[], void *cl_arg )
                  &zone, tileA->mat, tileA->ld,
                  handle );
 
+    (void)cl_arg;
     return;
 }
 #endif /* defined(CHAMELEON_USE_CUDA) */
@@ -67,7 +69,7 @@ cl_zgersum_redux_cuda_func( void *descr[], void *cl_arg )
 /*
  * Codelet definition
  */
-CODELETS( zgersum_redux, cl_zgersum_redux_cpu_func, cl_zgersum_redux_cuda_func, STARPU_CUDA_ASYNC );
+CODELETS( zgersum_redux, cl_zgersum_redux_cpu_func, cl_zgersum_redux_cuda_func, STARPU_CUDA_ASYNC )
 
 #if !defined(CHAMELEON_SIMULATION)
 static void
@@ -103,7 +105,7 @@ cl_zgersum_init_cuda_func( void *descr[], void *cl_arg )
 /*
  * Codelet definition
  */
-CODELETS( zgersum_init, cl_zgersum_init_cpu_func, cl_zgersum_init_cuda_func, STARPU_CUDA_ASYNC );
+CODELETS( zgersum_init, cl_zgersum_init_cpu_func, cl_zgersum_init_cuda_func, STARPU_CUDA_ASYNC )
 
 void
 RUNTIME_zgersum_set_methods( const CHAM_desc_t *A, int Am, int An )
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index 4451431f4c075feca2d6d6f6170098be3cf1d3cc..baf094206c5bc9d0952d167ad287d7a564058a96 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -101,8 +101,9 @@ void INSERT_TASK_zhemm_Astat( const RUNTIME_option_t *options,
                               CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zhemm_args_s  *clargs = NULL;
@@ -187,8 +188,9 @@ void INSERT_TASK_zhemm( const RUNTIME_option_t *options,
                         CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zhemm_args_s  *clargs = NULL;
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index 9fa3a1f782aa51f49a542d9d7da2bda3bf3aede9..0bd71121a8db1feb978181341e71e5dad8a44d6e 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -97,8 +97,9 @@ INSERT_TASK_zher2k( const RUNTIME_option_t *options,
                     double beta,                 const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, uplo, n, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, uplo, n, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     (void)nb;
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index a83d212a6cb7319f4b14f18c561d5f07aed9bc65..864b492e72c140e8b0bbbd0de05b97bd34fea7db 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -88,8 +88,9 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
                         double beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, uplo, n, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, uplo, n, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zherk_args_s *clargs = NULL;
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index 986292de9dcbc550e0d6b22b8553bec1a8e2a661..aacfbbb3fb0f0d9c09d01f3f6dd888546d2182ea 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -57,8 +57,9 @@ void INSERT_TASK_zlascal( const RUNTIME_option_t *options,
                           const CHAM_desc_t *A, int Am, int An )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlaset( options, uplo, m, n,
-                                   alpha, alpha, A, Am, An );
+        INSERT_TASK_zlaset( options, uplo, m, n,
+                            alpha, alpha, A, Am, An );
+        return;
     }
     else if ( alpha == 1. ) {
         return;
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index 62b8de470b7c36f0cb82ecf826c0444707289d71..d641fa8c18b14cadd7a018be6712ca24e98ef8f6 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -101,8 +101,9 @@ void INSERT_TASK_zsymm_Astat( const RUNTIME_option_t *options,
                               CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zsymm_args_s  *clargs = NULL;
@@ -187,8 +188,9 @@ void INSERT_TASK_zsymm( const RUNTIME_option_t *options,
                         CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, ChamUpperLower, m, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zsymm_args_s  *clargs = NULL;
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index 169936ca95ff61153ffc582a73e63d0d21319887..d4c8686a4c248052435f344667bac610c0c1cdd5 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -96,8 +96,9 @@ void INSERT_TASK_zsyr2k(const RUNTIME_option_t *options,
                        CHAMELEON_Complex64_t beta, const CHAM_desc_t *C, int Cm, int Cn)
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, uplo, n, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, uplo, n, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     (void)nb;
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index 86a95d034f5fab0cf1e12eec399a17b4c4f556e9..d6fa9a62a47affecb1a7d1e8716c259ee4b18282 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -88,8 +88,9 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
                         CHAMELEON_Complex64_t beta,  const CHAM_desc_t *C, int Cm, int Cn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, uplo, n, n, nb,
-                                    beta, C, Cm, Cn );
+        INSERT_TASK_zlascal( options, uplo, n, n, nb,
+                             beta, C, Cm, Cn );
+        return;
     }
 
     struct cl_zsyrk_args_s *clargs = NULL;
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index f1522ecc06f82b994a50d407a0530b2a7ca4ea29..6b6d3e34db9123bc42f3f92fa305436ded1e8caf 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -61,8 +61,9 @@ void INSERT_TASK_ztradd( const RUNTIME_option_t *options,
                          CHAMELEON_Complex64_t beta,  const CHAM_desc_t *B, int Bm, int Bn )
 {
     if ( alpha == 0. ) {
-        return INSERT_TASK_zlascal( options, uplo, m, n, nb,
-                                    beta, B, Bm, Bn );
+        INSERT_TASK_zlascal( options, uplo, m, n, nb,
+                             beta, B, Bm, Bn );
+        return;
     }
 
     struct cl_ztradd_args_s *clargs = NULL;