diff --git a/base/tools/psb_csphalo.F90 b/base/tools/psb_csphalo.F90
index f2106826..2cb3265c 100644
--- a/base/tools/psb_csphalo.F90
+++ b/base/tools/psb_csphalo.F90
@@ -78,8 +78,9 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,&
   integer(psb_ipk_) :: np,me,counter,proc,i, &
        &     n_el_send,k,n_el_recv,ictxt, idx, r, tot_elem,&
        &     n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
-       &     irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr
-  integer(psb_ipk_) :: l1, icomm, err_act
+       &     irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr,&
+       &     l1, err_act
+  integer(psb_mpik_) :: icomm
   integer(psb_mpik_), allocatable  :: brvindx(:), &
        & rvsz(:), bsdindx(:),sdsz(:)
   integer(psb_ipk_), allocatable  :: iasnd(:), jasnd(:)
@@ -272,8 +273,8 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,&
   end if
 
 
-  call mpi_alltoallv(valsnd,sdsz,bsdindx,psb_mpi_c_spk_,&
-       & acoo%val,rvsz,brvindx,psb_mpi_c_spk_,icomm,info)
+  call mpi_alltoallv(valsnd,sdsz,bsdindx,mpi_complex,&
+       & acoo%val,rvsz,brvindx,mpi_complex,icomm,info)
   call mpi_alltoallv(iasnd,sdsz,bsdindx,psb_mpi_ipk_integer,&
        & acoo%ia,rvsz,brvindx,psb_mpi_ipk_integer,icomm,info)
   call mpi_alltoallv(jasnd,sdsz,bsdindx,psb_mpi_ipk_integer,&
diff --git a/base/tools/psb_dsphalo.F90 b/base/tools/psb_dsphalo.F90
index b04bc822..7b536bfa 100644
--- a/base/tools/psb_dsphalo.F90
+++ b/base/tools/psb_dsphalo.F90
@@ -78,8 +78,9 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
   integer(psb_ipk_) :: np,me,counter,proc,i, &
        &     n_el_send,k,n_el_recv,ictxt, idx, r, tot_elem,&
        &     n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
-       &     irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr
-  integer(psb_ipk_) :: l1, icomm, err_act
+       &     irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr,&
+       &     l1, err_act
+  integer(psb_mpik_) :: icomm
   integer(psb_mpik_), allocatable  :: brvindx(:), &
        & rvsz(:), bsdindx(:),sdsz(:)
   integer(psb_ipk_), allocatable  :: iasnd(:), jasnd(:)
@@ -272,8 +273,8 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
   end if
 
 
-  call mpi_alltoallv(valsnd,sdsz,bsdindx,psb_mpi_r_dpk_,&
-       & acoo%val,rvsz,brvindx,psb_mpi_r_dpk_,icomm,info)
+  call mpi_alltoallv(valsnd,sdsz,bsdindx,mpi_double_precision,&
+       & acoo%val,rvsz,brvindx,mpi_double_precision,icomm,info)
   call mpi_alltoallv(iasnd,sdsz,bsdindx,psb_mpi_ipk_integer,&
        & acoo%ia,rvsz,brvindx,psb_mpi_ipk_integer,icomm,info)
   call mpi_alltoallv(jasnd,sdsz,bsdindx,psb_mpi_ipk_integer,&
diff --git a/base/tools/psb_ssphalo.F90 b/base/tools/psb_ssphalo.F90
index 4b4b319c..bb737131 100644
--- a/base/tools/psb_ssphalo.F90
+++ b/base/tools/psb_ssphalo.F90
@@ -78,8 +78,9 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,&
   integer(psb_ipk_) :: np,me,counter,proc,i, &
        &     n_el_send,k,n_el_recv,ictxt, idx, r, tot_elem,&
        &     n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
-       &     irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr
-  integer(psb_ipk_) :: l1, icomm, err_act
+       &     irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr,&
+       &     l1, err_act
+  integer(psb_mpik_) :: icomm
   integer(psb_mpik_), allocatable  :: brvindx(:), &
        & rvsz(:), bsdindx(:),sdsz(:)
   integer(psb_ipk_), allocatable  :: iasnd(:), jasnd(:)
@@ -272,8 +273,8 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,&
   end if
 
 
-  call mpi_alltoallv(valsnd,sdsz,bsdindx,psb_mpi_r_spk_,&
-       & acoo%val,rvsz,brvindx,psb_mpi_r_spk_,icomm,info)
+  call mpi_alltoallv(valsnd,sdsz,bsdindx,mpi_real,&
+       & acoo%val,rvsz,brvindx,mpi_real,icomm,info)
   call mpi_alltoallv(iasnd,sdsz,bsdindx,psb_mpi_ipk_integer,&
        & acoo%ia,rvsz,brvindx,psb_mpi_ipk_integer,icomm,info)
   call mpi_alltoallv(jasnd,sdsz,bsdindx,psb_mpi_ipk_integer,&
diff --git a/base/tools/psb_zsphalo.F90 b/base/tools/psb_zsphalo.F90
index 6c85a040..a12e4ae5 100644
--- a/base/tools/psb_zsphalo.F90
+++ b/base/tools/psb_zsphalo.F90
@@ -78,8 +78,9 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
   integer(psb_ipk_) :: np,me,counter,proc,i, &
        &     n_el_send,k,n_el_recv,ictxt, idx, r, tot_elem,&
        &     n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,&
-       &     irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr
-  integer(psb_ipk_) :: l1, icomm, err_act
+       &     irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr,&
+       &     l1, err_act
+  integer(psb_mpik_) :: icomm
   integer(psb_mpik_), allocatable  :: brvindx(:), &
        & rvsz(:), bsdindx(:),sdsz(:)
   integer(psb_ipk_), allocatable  :: iasnd(:), jasnd(:)
@@ -272,8 +273,8 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
   end if
 
 
-  call mpi_alltoallv(valsnd,sdsz,bsdindx,psb_mpi_c_dpk_,&
-       & acoo%val,rvsz,brvindx,psb_mpi_c_dpk_,icomm,info)
+  call mpi_alltoallv(valsnd,sdsz,bsdindx,mpi_double_complex,&
+       & acoo%val,rvsz,brvindx,mpi_double_complex,icomm,info)
   call mpi_alltoallv(iasnd,sdsz,bsdindx,psb_mpi_ipk_integer,&
        & acoo%ia,rvsz,brvindx,psb_mpi_ipk_integer,icomm,info)
   call mpi_alltoallv(jasnd,sdsz,bsdindx,psb_mpi_ipk_integer,&