diff --git a/amgprec/impl/aggregator/amg_d_parmatch_aggregator_mat_asb.f90 b/amgprec/impl/aggregator/amg_d_parmatch_aggregator_mat_asb.f90
index 145f453e..b7cbcd4d 100644
--- a/amgprec/impl/aggregator/amg_d_parmatch_aggregator_mat_asb.f90
+++ b/amgprec/impl/aggregator/amg_d_parmatch_aggregator_mat_asb.f90
@@ -1,4 +1,4 @@
-!   !
+!
 !
 !                             AMG4PSBLAS version 1.0
 !    Algebraic Multigrid Package
diff --git a/amgprec/impl/aggregator/amg_d_parmatch_aggregator_mat_bld.f90 b/amgprec/impl/aggregator/amg_d_parmatch_aggregator_mat_bld.f90
index 3d5c8158..77972817 100644
--- a/amgprec/impl/aggregator/amg_d_parmatch_aggregator_mat_bld.f90
+++ b/amgprec/impl/aggregator/amg_d_parmatch_aggregator_mat_bld.f90
@@ -1,4 +1,4 @@
-!   !
+!
 !
 !                             AMG4PSBLAS version 1.0
 !    Algebraic Multigrid Package
@@ -167,7 +167,7 @@ subroutine  amg_d_parmatch_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
      & ac,desc_ac,op_prol,op_restr,t_prol,info)
   use psb_base_mod
   use amg_d_inner_mod
-  use amg_d_prec_type
+  use amg_base_prec_type
   use amg_d_parmatch_aggregator_mod, amg_protect_name => amg_d_parmatch_aggregator_mat_bld
   implicit none
 
@@ -187,7 +187,6 @@ subroutine  amg_d_parmatch_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
   integer(psb_ipk_)     :: np, me
   integer(psb_ipk_)     :: err_act
   integer(psb_ipk_)     :: debug_level, debug_unit
-  type(psb_dspmat_type) :: atmp
 
   name='d_parmatch_mat_bld'
   if (psb_get_errstatus().ne.0) return
diff --git a/amgprec/impl/aggregator/amg_d_parmatch_aggregator_tprol.f90 b/amgprec/impl/aggregator/amg_d_parmatch_aggregator_tprol.f90
index 0b9c3167..f50233b3 100644
--- a/amgprec/impl/aggregator/amg_d_parmatch_aggregator_tprol.f90
+++ b/amgprec/impl/aggregator/amg_d_parmatch_aggregator_tprol.f90
@@ -112,7 +112,7 @@
 subroutine  amg_d_parmatch_aggregator_build_tprol(ag,parms,ag_data,&
      & a,desc_a,ilaggr,nlaggr,t_prol,info)
   use psb_base_mod
-  use amg_d_prec_type
+  use amg_base_prec_type
   use amg_d_inner_mod
   use amg_d_parmatch_aggregator_mod, amg_protect_name => amg_d_parmatch_aggregator_build_tprol
   use iso_c_binding
diff --git a/amgprec/impl/aggregator/amg_s_parmatch_aggregator_mat_asb.f90 b/amgprec/impl/aggregator/amg_s_parmatch_aggregator_mat_asb.f90
index fac367f2..6c4c4af8 100644
--- a/amgprec/impl/aggregator/amg_s_parmatch_aggregator_mat_asb.f90
+++ b/amgprec/impl/aggregator/amg_s_parmatch_aggregator_mat_asb.f90
@@ -1,4 +1,4 @@
-!   !
+!
 !
 !                             AMG4PSBLAS version 1.0
 !    Algebraic Multigrid Package
diff --git a/amgprec/impl/aggregator/amg_s_parmatch_aggregator_mat_bld.f90 b/amgprec/impl/aggregator/amg_s_parmatch_aggregator_mat_bld.f90
index 2f072b7d..3bf6327c 100644
--- a/amgprec/impl/aggregator/amg_s_parmatch_aggregator_mat_bld.f90
+++ b/amgprec/impl/aggregator/amg_s_parmatch_aggregator_mat_bld.f90
@@ -167,7 +167,7 @@ subroutine  amg_s_parmatch_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
      & ac,desc_ac,op_prol,op_restr,t_prol,info)
   use psb_base_mod
   use amg_s_inner_mod
-  use amg_s_prec_type
+  use amg_base_prec_type
   use amg_s_parmatch_aggregator_mod, amg_protect_name => amg_s_parmatch_aggregator_mat_bld
   implicit none
 
@@ -187,7 +187,6 @@ subroutine  amg_s_parmatch_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,&
   integer(psb_ipk_)     :: np, me
   integer(psb_ipk_)     :: err_act
   integer(psb_ipk_)     :: debug_level, debug_unit
-  type(psb_sspmat_type) :: atmp
 
   name='d_parmatch_mat_bld'
   if (psb_get_errstatus().ne.0) return
diff --git a/amgprec/impl/aggregator/amg_s_parmatch_aggregator_tprol.f90 b/amgprec/impl/aggregator/amg_s_parmatch_aggregator_tprol.f90
index f239de95..5477fde2 100644
--- a/amgprec/impl/aggregator/amg_s_parmatch_aggregator_tprol.f90
+++ b/amgprec/impl/aggregator/amg_s_parmatch_aggregator_tprol.f90
@@ -1,4 +1,4 @@
-!   !
+!
 !
 !                             AMG4PSBLAS version 1.0
 !    Algebraic Multigrid Package
@@ -112,7 +112,7 @@
 subroutine  amg_s_parmatch_aggregator_build_tprol(ag,parms,ag_data,&
      & a,desc_a,ilaggr,nlaggr,t_prol,info)
   use psb_base_mod
-  use amg_s_prec_type
+  use amg_base_prec_type
   use amg_s_inner_mod
   use amg_s_parmatch_aggregator_mod, amg_protect_name => amg_s_parmatch_aggregator_build_tprol
   use iso_c_binding