diff --git a/parsec/data_dist/matrix/matrix.c b/parsec/data_dist/matrix/matrix.c
index be662cba5..d50b3bcf4 100644
--- a/parsec/data_dist/matrix/matrix.c
+++ b/parsec/data_dist/matrix/matrix.c
@@ -94,7 +94,7 @@ void parsec_tiled_matrix_init( parsec_tiled_matrix_t *tdesc,
     tdesc->tileld   = (storage == PARSEC_MATRIX_TILE) ? mb : lm;
     tdesc->mb       = mb;
     tdesc->nb       = nb;
-    tdesc->bsiz     = mb * nb;
+    tdesc->bsiz     = (size_t)mb * nb;
 
     /* Large matrix parameters */
     tdesc->lm = lm;
@@ -304,7 +304,8 @@ int parsec_tiled_matrix_data_read(parsec_tiled_matrix_t *tdesc, char *filename)
     parsec_data_t* data;
     FILE *tmpf;
     char *buf;
-    int i, j, k, ret;
+    int i, j, k;
+    size_t ret;
     uint32_t myrank = tdesc->super.myrank;
     int eltsize =  parsec_datadist_getsizeoftype( tdesc->mtype );
 
diff --git a/parsec/data_dist/matrix/matrix.h b/parsec/data_dist/matrix/matrix.h
index 24fe57463..b80b518fe 100644
--- a/parsec/data_dist/matrix/matrix.h
+++ b/parsec/data_dist/matrix/matrix.h
@@ -104,7 +104,7 @@ typedef struct parsec_tiled_matrix_s {
     int tileld;         /**< leading dimension of each tile (Should be a function depending on the row) */
     int mb;             /**< number of rows in a tile */
     int nb;             /**< number of columns in a tile */
-    int bsiz;           /**< size in elements including padding of a tile - derived parameter */
+    size_t bsiz;        /**< size in elements including padding of a tile - derived parameter */
     int lm;             /**< number of rows of the entire matrix */
     int ln;             /**< number of columns of the entire matrix */
     int lmt;            /**< number of tile rows of the entire matrix - derived parameter */