diff --git a/control/control.c b/control/control.c
index af8de2390d25bac1285d290e726a044b559e6aa4..62762469f26f788eb215811a663355b0489ef616 100644
--- a/control/control.c
+++ b/control/control.c
@@ -94,22 +94,24 @@ int __chameleon_initpar(int ncpus, int ngpus, int nthreads_per_worker)
     chamctxt->mpi_outer_init = 1;
 #  else
     {
-      int flag = 0, provided = 0;
-      MPI_Initialized( &flag );
-      chamctxt->mpi_outer_init = flag;
-      if ( !flag ) {
-          /* MPI_THREAD_SERIALIZED should be enough.
-           * In testings, only StarPU's internal thread performs
-           * communications, and *then* Chameleon performs communications in
-           * the check step. */
-          const int required = MPI_THREAD_MULTIPLE;
-          if ( MPI_Init_thread( NULL, NULL, required, &provided ) != MPI_SUCCESS) {
-             chameleon_fatal_error("CHAMELEON_Init", "MPI_Init_thread() failed");
-          }
-          if ( provided < required ) {
-             chameleon_fatal_error("CHAMELEON_Init", "MPI_Init_thread() was not able to provide the requested thread support (MPI_THREAD_MULTIPLE), this may be an issue if the level provided is not enough for the underlying runtime system.");
-          }
-      }
+        int flag = 0, provided = 0;
+        MPI_Initialized( &flag );
+        chamctxt->mpi_outer_init = flag;
+        if ( !flag ) {
+            /* MPI_THREAD_SERIALIZED should be enough.
+             * In testings, only StarPU's internal thread performs
+             * communications, and *then* Chameleon performs communications in
+             * the check step. */
+            const int required = MPI_THREAD_MULTIPLE;
+            if ( MPI_Init_thread( NULL, NULL, required, &provided ) != MPI_SUCCESS) {
+                chameleon_fatal_error("CHAMELEON_Init", "MPI_Init_thread() failed");
+            }
+            if ( provided < required ) {
+                chameleon_fatal_error("CHAMELEON_Init",
+                                      "MPI_Init_thread() was not able to provide the requested thread support (MPI_THREAD_MULTIPLE),\n"
+                                      "this may be an issue if the level provided is not enough for the underlying runtime system." );
+            }
+        }
     }
 #  endif
 #endif
diff --git a/include/chameleon/struct.h b/include/chameleon/struct.h
index 289f4cad9c32e4602b1beda5503aa60ac72725ad..a6175854e0a3dcdf4841e2d5a482d2856ef2bfb2 100644
--- a/include/chameleon/struct.h
+++ b/include/chameleon/struct.h
@@ -121,7 +121,7 @@ struct chameleon_desc_s {
     int register_mat; // 1 if we have to register mat - else 0 (handled by the application)
     int myrank;       // MPI rank of the descriptor
     int ooc;          // 1 if the matrix is not to fit in memory
-    int64_t mpitag;   // First MPI tag used by the decriptor
+    int64_t mpitag;   // First MPI tag used by the descriptor
     void *schedopt;   // scheduler (QUARK|StarPU) specific structure
 };
 
diff --git a/runtime/starpu/control/runtime_tags.c b/runtime/starpu/control/runtime_tags.c
index 3f10ddbc980b7d573b829c1ebe1ac2bc8d490814..80705fc44f037c2bd094ea048aabe48add557612 100644
--- a/runtime/starpu/control/runtime_tags.c
+++ b/runtime/starpu/control/runtime_tags.c
@@ -49,12 +49,8 @@ static int64_t starpu_tag_ub = 0;
  *
  * @brief Initialize the StarPU tags manager.
  *
- *******************************************************************************
- *
- * @retval TODO
- *
  ******************************************************************************/
-int
+void
 chameleon_starpu_tag_init( void )
 {
     if (!starpu_tag_ub) {
@@ -67,11 +63,6 @@ chameleon_starpu_tag_init( void )
         if ( !ok ) {
             chameleon_error("chameleon_starpu_tag_init", "MPI_TAG_UB not known by StarPU\n");
         }
-
-        return CHAMELEON_SUCCESS;
-    }
-    else {
-        return CHAMELEON_ERR_REINITIALIZED;
     }
 }
 
@@ -216,10 +207,6 @@ chameleon_starpu_tag_release( int64_t min )
  *
  * @brief Initialize the StarPU tags manager.
  *
- *******************************************************************************
- *
- * @retval TODO
- *
  ******************************************************************************/
 void
 chameleon_starpu_tag_init( ) {
diff --git a/runtime/starpu/control/runtime_workspace.c b/runtime/starpu/control/runtime_workspace.c
index ad9b5cd9fd0d0abb8f7760b9a66c0936473f1281..bbbb5710e162a82f69a6e1c65aa2dde706688e84 100644
--- a/runtime/starpu/control/runtime_workspace.c
+++ b/runtime/starpu/control/runtime_workspace.c
@@ -23,15 +23,15 @@
 
 #if defined(CHAMELEON_USE_CUDA)
 #define GPU_WORKER_TYPE STARPU_CUDA_WORKER
-#define gpuMallocHost   cudaMallocHost
+#define gpuMallocHost( _ptr_, _size_ ) cudaMallocHost( (_ptr_), (_size_) )
 #define gpuMalloc       cudaMalloc
 #define gpuFreeHost     cudaFreeHost
 #define gpuFree         cudaFree
 #elif defined(CHAMELEON_USE_HIP)
 #define GPU_WORKER_TYPE STARPU_HIP_WORKER
-#define gpuMallocHost   hipMallocHost
+#define gpuMallocHost( _ptr_, _size_ ) hipHostMalloc( (_ptr_), (_size_), 0 )
 #define gpuMalloc       hipMalloc
-#define gpuFreeHost     hipFreeHost
+#define gpuFreeHost     hipHostFree
 #define gpuFree         hipFree
 #endif