diff --git a/mlprec/impl/aggregator/mld_c_map_to_tprol.f90 b/mlprec/impl/aggregator/mld_c_map_to_tprol.f90
index 834d2a1f..6c628e64 100644
--- a/mlprec/impl/aggregator/mld_c_map_to_tprol.f90
+++ b/mlprec/impl/aggregator/mld_c_map_to_tprol.f90
@@ -99,7 +99,7 @@ subroutine mld_c_map_to_tprol(desc_a,ilaggr,nlaggr,op_prol,info)
   integer(psb_ipk_), intent(out)               :: info
 
   ! Local variables
-  integer(psb_ipk_) :: icnt,nlp,k,n,ia,isz,nr, naggr,i,j,m,naggrm1, naggrp1, ntaggr
+  integer(psb_lpk_) :: icnt,nlp,k,n,ia,isz,nr, naggr,i,j,m,naggrm1, naggrp1, ntaggr
   type(psb_lc_coo_sparse_mat) :: tmpcoo
   integer(psb_ipk_) :: debug_level, debug_unit,err_act
   integer(psb_ipk_) :: ictxt,np,me
diff --git a/mlprec/impl/aggregator/mld_c_symdec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_c_symdec_aggregator_tprol.f90
index 1087c0d5..b3ea987b 100644
--- a/mlprec/impl/aggregator/mld_c_symdec_aggregator_tprol.f90
+++ b/mlprec/impl/aggregator/mld_c_symdec_aggregator_tprol.f90
@@ -89,11 +89,12 @@ subroutine  mld_c_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,
   integer(psb_ipk_), intent(out)      :: info
 
   ! Local variables
-  type(psb_lcspmat_type) :: atmp, atrans
+  type(psb_cspmat_type) :: atmp, atrans
   character(len=20)           :: name
   integer(psb_mpk_)           :: ictxt, np, me
   integer(psb_ipk_)           :: err_act
-  integer(psb_lpk_)           :: ntaggr, nr
+  integer(psb_ipk_)           :: nr
+  integer(psb_lpk_)           :: ntaggr
   integer(psb_ipk_)           :: debug_level, debug_unit
 
   name='mld_c_symdec_aggregator_tprol'
@@ -113,9 +114,8 @@ subroutine  mld_c_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,
        &   mld_aggr_ord_nat_,is_legal_ml_aggr_ord)
   call mld_check_def(parms%aggr_thresh,'Aggr_Thresh',szero,is_legal_s_aggr_thrs)
 
-  call a%cp_to_l(atrans)
   nr = a%get_nrows()
-  call atrans%csclip(atmp,info,imax=nr,jmax=nr,&
+  call a%csclip(atmp,info,imax=nr,jmax=nr,&
        & rscale=.false.,cscale=.false.)
   call atmp%set_nrows(nr)
   call atmp%set_ncols(nr)
diff --git a/mlprec/impl/aggregator/mld_d_map_to_tprol.f90 b/mlprec/impl/aggregator/mld_d_map_to_tprol.f90
index 6d8d4491..caea7c41 100644
--- a/mlprec/impl/aggregator/mld_d_map_to_tprol.f90
+++ b/mlprec/impl/aggregator/mld_d_map_to_tprol.f90
@@ -99,7 +99,7 @@ subroutine mld_d_map_to_tprol(desc_a,ilaggr,nlaggr,op_prol,info)
   integer(psb_ipk_), intent(out)               :: info
 
   ! Local variables
-  integer(psb_ipk_) :: icnt,nlp,k,n,ia,isz,nr, naggr,i,j,m,naggrm1, naggrp1, ntaggr
+  integer(psb_lpk_) :: icnt,nlp,k,n,ia,isz,nr, naggr,i,j,m,naggrm1, naggrp1, ntaggr
   type(psb_ld_coo_sparse_mat) :: tmpcoo
   integer(psb_ipk_) :: debug_level, debug_unit,err_act
   integer(psb_ipk_) :: ictxt,np,me
diff --git a/mlprec/impl/aggregator/mld_d_symdec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_d_symdec_aggregator_tprol.f90
index 8270b665..2b55b740 100644
--- a/mlprec/impl/aggregator/mld_d_symdec_aggregator_tprol.f90
+++ b/mlprec/impl/aggregator/mld_d_symdec_aggregator_tprol.f90
@@ -89,11 +89,12 @@ subroutine  mld_d_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,
   integer(psb_ipk_), intent(out)      :: info
 
   ! Local variables
-  type(psb_ldspmat_type) :: atmp, atrans
+  type(psb_dspmat_type) :: atmp, atrans
   character(len=20)           :: name
   integer(psb_mpk_)           :: ictxt, np, me
   integer(psb_ipk_)           :: err_act
-  integer(psb_lpk_)           :: ntaggr, nr
+  integer(psb_ipk_)           :: nr
+  integer(psb_lpk_)           :: ntaggr
   integer(psb_ipk_)           :: debug_level, debug_unit
 
   name='mld_d_symdec_aggregator_tprol'
@@ -113,9 +114,8 @@ subroutine  mld_d_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,
        &   mld_aggr_ord_nat_,is_legal_ml_aggr_ord)
   call mld_check_def(parms%aggr_thresh,'Aggr_Thresh',dzero,is_legal_d_aggr_thrs)
 
-  call a%cp_to_l(atrans)
   nr = a%get_nrows()
-  call atrans%csclip(atmp,info,imax=nr,jmax=nr,&
+  call a%csclip(atmp,info,imax=nr,jmax=nr,&
        & rscale=.false.,cscale=.false.)
   call atmp%set_nrows(nr)
   call atmp%set_ncols(nr)
diff --git a/mlprec/impl/aggregator/mld_s_map_to_tprol.f90 b/mlprec/impl/aggregator/mld_s_map_to_tprol.f90
index 53bb3627..54ac8467 100644
--- a/mlprec/impl/aggregator/mld_s_map_to_tprol.f90
+++ b/mlprec/impl/aggregator/mld_s_map_to_tprol.f90
@@ -99,7 +99,7 @@ subroutine mld_s_map_to_tprol(desc_a,ilaggr,nlaggr,op_prol,info)
   integer(psb_ipk_), intent(out)               :: info
 
   ! Local variables
-  integer(psb_ipk_) :: icnt,nlp,k,n,ia,isz,nr, naggr,i,j,m,naggrm1, naggrp1, ntaggr
+  integer(psb_lpk_) :: icnt,nlp,k,n,ia,isz,nr, naggr,i,j,m,naggrm1, naggrp1, ntaggr
   type(psb_ls_coo_sparse_mat) :: tmpcoo
   integer(psb_ipk_) :: debug_level, debug_unit,err_act
   integer(psb_ipk_) :: ictxt,np,me
diff --git a/mlprec/impl/aggregator/mld_s_symdec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_s_symdec_aggregator_tprol.f90
index 401efb4c..93b73b49 100644
--- a/mlprec/impl/aggregator/mld_s_symdec_aggregator_tprol.f90
+++ b/mlprec/impl/aggregator/mld_s_symdec_aggregator_tprol.f90
@@ -89,11 +89,12 @@ subroutine  mld_s_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,
   integer(psb_ipk_), intent(out)      :: info
 
   ! Local variables
-  type(psb_lsspmat_type) :: atmp, atrans
+  type(psb_sspmat_type) :: atmp, atrans
   character(len=20)           :: name
   integer(psb_mpk_)           :: ictxt, np, me
   integer(psb_ipk_)           :: err_act
-  integer(psb_lpk_)           :: ntaggr, nr
+  integer(psb_ipk_)           :: nr
+  integer(psb_lpk_)           :: ntaggr
   integer(psb_ipk_)           :: debug_level, debug_unit
 
   name='mld_s_symdec_aggregator_tprol'
@@ -113,9 +114,8 @@ subroutine  mld_s_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,
        &   mld_aggr_ord_nat_,is_legal_ml_aggr_ord)
   call mld_check_def(parms%aggr_thresh,'Aggr_Thresh',szero,is_legal_s_aggr_thrs)
 
-  call a%cp_to_l(atrans)
   nr = a%get_nrows()
-  call atrans%csclip(atmp,info,imax=nr,jmax=nr,&
+  call a%csclip(atmp,info,imax=nr,jmax=nr,&
        & rscale=.false.,cscale=.false.)
   call atmp%set_nrows(nr)
   call atmp%set_ncols(nr)
diff --git a/mlprec/impl/aggregator/mld_z_map_to_tprol.f90 b/mlprec/impl/aggregator/mld_z_map_to_tprol.f90
index b4d256f0..25c207fc 100644
--- a/mlprec/impl/aggregator/mld_z_map_to_tprol.f90
+++ b/mlprec/impl/aggregator/mld_z_map_to_tprol.f90
@@ -99,7 +99,7 @@ subroutine mld_z_map_to_tprol(desc_a,ilaggr,nlaggr,op_prol,info)
   integer(psb_ipk_), intent(out)               :: info
 
   ! Local variables
-  integer(psb_ipk_) :: icnt,nlp,k,n,ia,isz,nr, naggr,i,j,m,naggrm1, naggrp1, ntaggr
+  integer(psb_lpk_) :: icnt,nlp,k,n,ia,isz,nr, naggr,i,j,m,naggrm1, naggrp1, ntaggr
   type(psb_lz_coo_sparse_mat) :: tmpcoo
   integer(psb_ipk_) :: debug_level, debug_unit,err_act
   integer(psb_ipk_) :: ictxt,np,me
diff --git a/mlprec/impl/aggregator/mld_z_symdec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_z_symdec_aggregator_tprol.f90
index d50fc63e..0c97aa92 100644
--- a/mlprec/impl/aggregator/mld_z_symdec_aggregator_tprol.f90
+++ b/mlprec/impl/aggregator/mld_z_symdec_aggregator_tprol.f90
@@ -89,11 +89,12 @@ subroutine  mld_z_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,
   integer(psb_ipk_), intent(out)      :: info
 
   ! Local variables
-  type(psb_lzspmat_type) :: atmp, atrans
+  type(psb_zspmat_type) :: atmp, atrans
   character(len=20)           :: name
   integer(psb_mpk_)           :: ictxt, np, me
   integer(psb_ipk_)           :: err_act
-  integer(psb_lpk_)           :: ntaggr, nr
+  integer(psb_ipk_)           :: nr
+  integer(psb_lpk_)           :: ntaggr
   integer(psb_ipk_)           :: debug_level, debug_unit
 
   name='mld_z_symdec_aggregator_tprol'
@@ -113,9 +114,8 @@ subroutine  mld_z_symdec_aggregator_build_tprol(ag,parms,a,desc_a,ilaggr,nlaggr,
        &   mld_aggr_ord_nat_,is_legal_ml_aggr_ord)
   call mld_check_def(parms%aggr_thresh,'Aggr_Thresh',dzero,is_legal_d_aggr_thrs)
 
-  call a%cp_to_l(atrans)
   nr = a%get_nrows()
-  call atrans%csclip(atmp,info,imax=nr,jmax=nr,&
+  call a%csclip(atmp,info,imax=nr,jmax=nr,&
        & rscale=.false.,cscale=.false.)
   call atmp%set_nrows(nr)
   call atmp%set_ncols(nr)
diff --git a/mlprec/impl/level/mld_c_base_onelev_mat_asb.f90 b/mlprec/impl/level/mld_c_base_onelev_mat_asb.f90
index ffca0f19..f34ead9e 100644
--- a/mlprec/impl/level/mld_c_base_onelev_mat_asb.f90
+++ b/mlprec/impl/level/mld_c_base_onelev_mat_asb.f90
@@ -160,7 +160,7 @@ subroutine mld_c_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info)
     nzl = bcoo%get_nzeros()
     inl = nlaggr(me+1)
     if (inl < nlaggr(me+1)) then
-      info = psb_bad_int_cnv_
+      info = psb_err_bad_int_cnv_
       call psb_errpush(info,name,&
            & e_err=(/nlaggr(me+1),inl*1_psb_lpk_/))
       goto 9999
diff --git a/mlprec/impl/level/mld_d_base_onelev_mat_asb.f90 b/mlprec/impl/level/mld_d_base_onelev_mat_asb.f90
index b6477cdd..f962d790 100644
--- a/mlprec/impl/level/mld_d_base_onelev_mat_asb.f90
+++ b/mlprec/impl/level/mld_d_base_onelev_mat_asb.f90
@@ -160,7 +160,7 @@ subroutine mld_d_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info)
     nzl = bcoo%get_nzeros()
     inl = nlaggr(me+1)
     if (inl < nlaggr(me+1)) then
-      info = psb_bad_int_cnv_
+      info = psb_err_bad_int_cnv_
       call psb_errpush(info,name,&
            & e_err=(/nlaggr(me+1),inl*1_psb_lpk_/))
       goto 9999
diff --git a/mlprec/impl/level/mld_s_base_onelev_mat_asb.f90 b/mlprec/impl/level/mld_s_base_onelev_mat_asb.f90
index e8850e1f..6757cf54 100644
--- a/mlprec/impl/level/mld_s_base_onelev_mat_asb.f90
+++ b/mlprec/impl/level/mld_s_base_onelev_mat_asb.f90
@@ -160,7 +160,7 @@ subroutine mld_s_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info)
     nzl = bcoo%get_nzeros()
     inl = nlaggr(me+1)
     if (inl < nlaggr(me+1)) then
-      info = psb_bad_int_cnv_
+      info = psb_err_bad_int_cnv_
       call psb_errpush(info,name,&
            & e_err=(/nlaggr(me+1),inl*1_psb_lpk_/))
       goto 9999
diff --git a/mlprec/impl/level/mld_z_base_onelev_mat_asb.f90 b/mlprec/impl/level/mld_z_base_onelev_mat_asb.f90
index 3e7a1917..e3b22e41 100644
--- a/mlprec/impl/level/mld_z_base_onelev_mat_asb.f90
+++ b/mlprec/impl/level/mld_z_base_onelev_mat_asb.f90
@@ -160,7 +160,7 @@ subroutine mld_z_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info)
     nzl = bcoo%get_nzeros()
     inl = nlaggr(me+1)
     if (inl < nlaggr(me+1)) then
-      info = psb_bad_int_cnv_
+      info = psb_err_bad_int_cnv_
       call psb_errpush(info,name,&
            & e_err=(/nlaggr(me+1),inl*1_psb_lpk_/))
       goto 9999