diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index 8165382439692795b258f386d342136ad033db93..74ed2c3e604f687c300b1f63217efac71540adf2 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -45,7 +45,7 @@ void INSERT_TASK_zgetrf( const RUNTIME_option_t *options,
         STARPU_RW,                     RTBLKADDR(A, CHAMELEON_Complex64_t, Am, An),
         STARPU_VALUE,           &lda,                        sizeof(int),
         STARPU_VALUE,                  &IPIV,                      sizeof(int*),
-        STARPU_VALUE,    &check_info,                sizeof(int),
+        STARPU_VALUE,    &check_info,                sizeof(cham_bool_t),
         STARPU_VALUE,         &iinfo,                        sizeof(int),
         STARPU_PRIORITY,    options->priority,
         STARPU_CALLBACK,    callback,
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index e9f2232e1638a7c75525767f22784b2ae2eb0e67..4c701b35cd8379f66f41425c4e4fc787469b837a 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
@@ -109,7 +109,7 @@ void INSERT_TASK_zgetrf_incpiv(const RUNTIME_option_t *options,
         STARPU_W,         RTBLKADDR(L, CHAMELEON_Complex64_t, Lm, Ln),
         STARPU_VALUE,    &ldl,               sizeof(int),
         STARPU_VALUE,    &IPIV,              sizeof(int*),
-        STARPU_VALUE,    &check_info,        sizeof(int),
+        STARPU_VALUE,    &check_info,        sizeof(cham_bool_t),
         STARPU_VALUE,    &iinfo,             sizeof(int),
         STARPU_SCRATCH,   options->ws_worker,
         STARPU_VALUE,    &h_work,            sizeof(CHAMELEON_starpu_ws_t *),
diff --git a/runtime/starpu/codelets/codelet_ztstrf.c b/runtime/starpu/codelets/codelet_ztstrf.c
index fd22108cf1ee5e52ffd9db51f6442d148be570d8..b943c4091373dd260dc67247652e9eed82b8fa2e 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -128,7 +128,7 @@ void INSERT_TASK_ztstrf(const RUNTIME_option_t *options,
         STARPU_SCRATCH,   options->ws_worker,
         STARPU_VALUE,    &d_work,                    sizeof(CHAMELEON_starpu_ws_t *),
         STARPU_VALUE,    &nb,                        sizeof(int),
-        STARPU_VALUE,    &check_info,                sizeof(int),
+        STARPU_VALUE,    &check_info,                sizeof(cham_bool_t),
         STARPU_VALUE,    &iinfo,                     sizeof(int),
         STARPU_PRIORITY,  options->priority,
         STARPU_CALLBACK,  callback,
diff --git a/runtime/starpu/control/runtime_descriptor.c b/runtime/starpu/control/runtime_descriptor.c
index 60c368432e74a38ee0dd63fc91196544d0b38a23..c49978d8692a2158e5c800156a871d02de906116 100644
--- a/runtime/starpu/control/runtime_descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -45,15 +45,13 @@ chameleon_starpu_tag_init( int user_tag_width,
         tag_width = user_tag_width;
         tag_sep   = user_tag_sep;
 
+        void *tag_ub_p = NULL;
 #if defined(HAVE_STARPU_MPI_COMM_GET_ATTR)
-        int64_t *tag_ub_p = NULL;
         starpu_mpi_comm_get_attr(MPI_COMM_WORLD, STARPU_MPI_TAG_UB, &tag_ub_p, &ok);
-        tag_ub = *tag_ub_p;
 #else
-        int *tag_ub_p = NULL;
         MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, &tag_ub_p, &ok);
-        tag_ub = *tag_ub_p;
 #endif
+        tag_ub = (uintptr_t)tag_ub_p;
 
         if ( !ok ) {
             chameleon_error("RUNTIME_desc_create", "MPI_TAG_UB not known by StarPU");
@@ -235,12 +233,9 @@ void RUNTIME_desc_destroy( CHAM_desc_t *desc )
         for (n = 0; n < lnt; n++) {
             for (m = 0; m < lmt; m++)
             {
-                if (*handle == NULL)
-                {
-                    handle++;
-                    continue;
+                if (*handle != NULL) {
+                    starpu_data_unregister(*handle);
                 }
-                starpu_data_unregister(*handle);
                 handle++;
             }
         }
@@ -252,8 +247,8 @@ void RUNTIME_desc_destroy( CHAM_desc_t *desc )
             if (cudaHostUnregister(desc->mat) != cudaSuccess)
             {
                 chameleon_warning("RUNTIME_desc_destroy(StarPU)",
-                              "cudaHostUnregister failed to unregister the "
-                              "pinned memory associated to the matrix");
+                                  "cudaHostUnregister failed to unregister the "
+                                  "pinned memory associated to the matrix");
             }
         }
 #endif /* defined(CHAMELEON_USE_CUDA) */