diff --git a/control/tile.c b/control/tile.c
index 992949a9a606584d2511bf4745521cccca3dcb8f..ea216a770a6767745e2659cc27e4f312a3161808 100644
--- a/control/tile.c
+++ b/control/tile.c
@@ -121,7 +121,7 @@ int MORSE_Lapack_to_Tile(void *Af77, int LDA, MORSE_desc_t *A)
  *          Descriptor of the MORSE matrix in tile layout.
  *
  * @param[in] Af77
- *          LAPACK matrix.
+ *          LAPACK matrix (only needed on proc 0).
  *
  * @param[in] LDA
  *          The leading dimension of the matrix Af77.
diff --git a/example/out_of_core/out_of_core.c b/example/out_of_core/out_of_core.c
index a2551f1fac3e64fc5e6c773cb132bccaa379e4f8..5a8929e75fb7e44f77d1c4b61dcf7e777ead8c0a 100644
--- a/example/out_of_core/out_of_core.c
+++ b/example/out_of_core/out_of_core.c
@@ -105,7 +105,7 @@ int main(int argc, char *argv[]) {
 
     MORSE_Desc_Create_User(&descA, NULL, MorseRealDouble,
                            NB, NB, NB*NB, N, N, 0, 0, N, N, 1, 1,
-                           morse_getaddr_null,
+                           morse_getaddr_null, // specific function
                            morse_getblkldd_ccrb,
                            morse_getrankof_2d);
     MORSE_Desc_Create(&descB,  NULL, MorseRealDouble,
diff --git a/runtime/starpu/control/runtime_descriptor.c b/runtime/starpu/control/runtime_descriptor.c
index 0182d776f7a7ca789b3bdefc28899084357526a4..eb7e90a0a373542a5b80a1103b2f9c3c2a0065b8 100644
--- a/runtime/starpu/control/runtime_descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -301,7 +301,7 @@ void *RUNTIME_desc_getaddr( MORSE_desc_t *desc, int m, int n )
                                             BLKLDD(desc, m), tempmm, tempnn, eltsze);
             }
             else {
-                starpu_matrix_data_register(ptrtile, 0,
+                starpu_matrix_data_register(ptrtile, STARPU_MAIN_RAM,
                                             (uintptr_t)desc->get_blkaddr(desc, m, n),
                                             BLKLDD(desc, m), tempmm, tempnn, eltsze);
             }