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 43230a41..958e44c9 100644
--- a/mlprec/impl/level/mld_c_base_onelev_mat_asb.f90
+++ b/mlprec/impl/level/mld_c_base_onelev_mat_asb.f90
@@ -103,7 +103,7 @@ subroutine mld_c_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info)
 
   ! Local variables
   character(len=24)                :: name
-  integer(psb_mpk_)               :: ictxt, np, me
+  integer(psb_ipk_)               :: ictxt, np, me
   integer(psb_ipk_)                :: err_act
   type(psb_lcspmat_type)           :: lac, lac1, op_restr
   type(psb_cspmat_type)            :: ac, iop_restr, iop_prol
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 754b88eb..f8282108 100644
--- a/mlprec/impl/level/mld_d_base_onelev_mat_asb.f90
+++ b/mlprec/impl/level/mld_d_base_onelev_mat_asb.f90
@@ -103,7 +103,7 @@ subroutine mld_d_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info)
 
   ! Local variables
   character(len=24)                :: name
-  integer(psb_mpk_)               :: ictxt, np, me
+  integer(psb_ipk_)               :: ictxt, np, me
   integer(psb_ipk_)                :: err_act
   type(psb_ldspmat_type)           :: lac, lac1, op_restr
   type(psb_dspmat_type)            :: ac, iop_restr, iop_prol
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 76ea9a60..48c05088 100644
--- a/mlprec/impl/level/mld_s_base_onelev_mat_asb.f90
+++ b/mlprec/impl/level/mld_s_base_onelev_mat_asb.f90
@@ -103,7 +103,7 @@ subroutine mld_s_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info)
 
   ! Local variables
   character(len=24)                :: name
-  integer(psb_mpk_)               :: ictxt, np, me
+  integer(psb_ipk_)               :: ictxt, np, me
   integer(psb_ipk_)                :: err_act
   type(psb_lsspmat_type)           :: lac, lac1, op_restr
   type(psb_sspmat_type)            :: ac, iop_restr, iop_prol
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 7b8c138b..593c2935 100644
--- a/mlprec/impl/level/mld_z_base_onelev_mat_asb.f90
+++ b/mlprec/impl/level/mld_z_base_onelev_mat_asb.f90
@@ -103,7 +103,7 @@ subroutine mld_z_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info)
 
   ! Local variables
   character(len=24)                :: name
-  integer(psb_mpk_)               :: ictxt, np, me
+  integer(psb_ipk_)               :: ictxt, np, me
   integer(psb_ipk_)                :: err_act
   type(psb_lzspmat_type)           :: lac, lac1, op_restr
   type(psb_zspmat_type)            :: ac, iop_restr, iop_prol
diff --git a/mlprec/impl/solver/mld_c_bwgs_solver_bld.f90 b/mlprec/impl/solver/mld_c_bwgs_solver_bld.f90
index 04a5f12e..408b0ba9 100644
--- a/mlprec/impl/solver/mld_c_bwgs_solver_bld.f90
+++ b/mlprec/impl/solver/mld_c_bwgs_solver_bld.f90
@@ -78,7 +78,7 @@ subroutine mld_c_bwgs_solver_bld(a,desc_a,sv,info,b,amold,vmold,imold)
     ! This cuts out the off-diagonal part, because it's supposed to
     ! be handled by the outer Jacobi smoother.
     !
-    call a%tril(sv%l,info,diag=-1,jmax=nrow_a,u=sv%u)     
+    call a%tril(sv%l,info,diag=-ione,jmax=nrow_a,u=sv%u)     
 
   else
 
diff --git a/mlprec/impl/solver/mld_c_gs_solver_bld.f90 b/mlprec/impl/solver/mld_c_gs_solver_bld.f90
index b1052f2a..2103ab0f 100644
--- a/mlprec/impl/solver/mld_c_gs_solver_bld.f90
+++ b/mlprec/impl/solver/mld_c_gs_solver_bld.f90
@@ -76,7 +76,7 @@ subroutine mld_c_gs_solver_bld(a,desc_a,sv,info,b,amold,vmold,imold)
     ! This cuts out the off-diagonal part, because it's supposed to
     ! be handled by the outer Jacobi smoother.
     ! 
-    call a%tril(sv%l,info,diag=0,jmax=nrow_a,u=sv%u)
+    call a%tril(sv%l,info,diag=izero,jmax=nrow_a,u=sv%u)
 
   else
 
diff --git a/mlprec/impl/solver/mld_d_bwgs_solver_bld.f90 b/mlprec/impl/solver/mld_d_bwgs_solver_bld.f90
index 3fcc4f75..d6964cab 100644
--- a/mlprec/impl/solver/mld_d_bwgs_solver_bld.f90
+++ b/mlprec/impl/solver/mld_d_bwgs_solver_bld.f90
@@ -78,7 +78,7 @@ subroutine mld_d_bwgs_solver_bld(a,desc_a,sv,info,b,amold,vmold,imold)
     ! This cuts out the off-diagonal part, because it's supposed to
     ! be handled by the outer Jacobi smoother.
     !
-    call a%tril(sv%l,info,diag=-1,jmax=nrow_a,u=sv%u)     
+    call a%tril(sv%l,info,diag=-ione,jmax=nrow_a,u=sv%u)     
 
   else
 
diff --git a/mlprec/impl/solver/mld_d_gs_solver_bld.f90 b/mlprec/impl/solver/mld_d_gs_solver_bld.f90
index c9b23f4a..c2329e9c 100644
--- a/mlprec/impl/solver/mld_d_gs_solver_bld.f90
+++ b/mlprec/impl/solver/mld_d_gs_solver_bld.f90
@@ -76,7 +76,7 @@ subroutine mld_d_gs_solver_bld(a,desc_a,sv,info,b,amold,vmold,imold)
     ! This cuts out the off-diagonal part, because it's supposed to
     ! be handled by the outer Jacobi smoother.
     ! 
-    call a%tril(sv%l,info,diag=0,jmax=nrow_a,u=sv%u)
+    call a%tril(sv%l,info,diag=izero,jmax=nrow_a,u=sv%u)
 
   else
 
diff --git a/mlprec/impl/solver/mld_s_bwgs_solver_bld.f90 b/mlprec/impl/solver/mld_s_bwgs_solver_bld.f90
index 0d2eb1a3..d8312abc 100644
--- a/mlprec/impl/solver/mld_s_bwgs_solver_bld.f90
+++ b/mlprec/impl/solver/mld_s_bwgs_solver_bld.f90
@@ -78,7 +78,7 @@ subroutine mld_s_bwgs_solver_bld(a,desc_a,sv,info,b,amold,vmold,imold)
     ! This cuts out the off-diagonal part, because it's supposed to
     ! be handled by the outer Jacobi smoother.
     !
-    call a%tril(sv%l,info,diag=-1,jmax=nrow_a,u=sv%u)     
+    call a%tril(sv%l,info,diag=-ione,jmax=nrow_a,u=sv%u)     
 
   else
 
diff --git a/mlprec/impl/solver/mld_s_gs_solver_bld.f90 b/mlprec/impl/solver/mld_s_gs_solver_bld.f90
index 24fedbc6..3d5f7c84 100644
--- a/mlprec/impl/solver/mld_s_gs_solver_bld.f90
+++ b/mlprec/impl/solver/mld_s_gs_solver_bld.f90
@@ -76,7 +76,7 @@ subroutine mld_s_gs_solver_bld(a,desc_a,sv,info,b,amold,vmold,imold)
     ! This cuts out the off-diagonal part, because it's supposed to
     ! be handled by the outer Jacobi smoother.
     ! 
-    call a%tril(sv%l,info,diag=0,jmax=nrow_a,u=sv%u)
+    call a%tril(sv%l,info,diag=izero,jmax=nrow_a,u=sv%u)
 
   else
 
diff --git a/mlprec/impl/solver/mld_z_bwgs_solver_bld.f90 b/mlprec/impl/solver/mld_z_bwgs_solver_bld.f90
index 38454e18..e02d53fb 100644
--- a/mlprec/impl/solver/mld_z_bwgs_solver_bld.f90
+++ b/mlprec/impl/solver/mld_z_bwgs_solver_bld.f90
@@ -78,7 +78,7 @@ subroutine mld_z_bwgs_solver_bld(a,desc_a,sv,info,b,amold,vmold,imold)
     ! This cuts out the off-diagonal part, because it's supposed to
     ! be handled by the outer Jacobi smoother.
     !
-    call a%tril(sv%l,info,diag=-1,jmax=nrow_a,u=sv%u)     
+    call a%tril(sv%l,info,diag=-ione,jmax=nrow_a,u=sv%u)     
 
   else
 
diff --git a/mlprec/impl/solver/mld_z_gs_solver_bld.f90 b/mlprec/impl/solver/mld_z_gs_solver_bld.f90
index a3934cd5..c6a316ed 100644
--- a/mlprec/impl/solver/mld_z_gs_solver_bld.f90
+++ b/mlprec/impl/solver/mld_z_gs_solver_bld.f90
@@ -76,7 +76,7 @@ subroutine mld_z_gs_solver_bld(a,desc_a,sv,info,b,amold,vmold,imold)
     ! This cuts out the off-diagonal part, because it's supposed to
     ! be handled by the outer Jacobi smoother.
     ! 
-    call a%tril(sv%l,info,diag=0,jmax=nrow_a,u=sv%u)
+    call a%tril(sv%l,info,diag=izero,jmax=nrow_a,u=sv%u)
 
   else