diff --git a/base/modules/desc/psb_gen_block_map_mod.F90 b/base/modules/desc/psb_gen_block_map_mod.F90
index f1953f7c..b53713a5 100644
--- a/base/modules/desc/psb_gen_block_map_mod.F90
+++ b/base/modules/desc/psb_gen_block_map_mod.F90
@@ -127,7 +127,7 @@ module psb_gen_block_map_mod
 #if defined(IPK4) && defined(LPK8)
   private ::  l_gen_block_search
 #endif
-  
+
   interface gen_block_search
     module procedure i_gen_block_search
 #if defined(IPK4) && defined(LPK8)
@@ -373,7 +373,7 @@ contains
     integer(psb_ipk_), intent(out)   :: info 
     logical, intent(in), optional :: mask(:)
     logical, intent(in), optional :: owned
-    integer(psb_ipk_) :: i
+    integer(psb_lpk_) :: i
     logical :: owned_
     info = 0
 
@@ -431,7 +431,7 @@ contains
     integer(psb_ipk_), intent(out)   :: info 
     logical, intent(in), optional :: mask(:)
     logical, intent(in), optional :: owned
-    integer(psb_ipk_) :: is, im, i
+    integer(psb_lpk_) :: is, im, i
     logical :: owned_
 
     info = 0
@@ -1527,7 +1527,7 @@ contains
     logical, intent(in), optional :: mask(:)
     integer(psb_ipk_), intent(in), optional :: lidx(:)
 
-    integer(psb_ipk_) :: i, nv, is, ix
+    integer(psb_lpk_) :: i, nv, is, ix
     integer(psb_lpk_) :: ip, lip, lnxt
     integer(psb_ipk_) :: nxt
 
@@ -1732,7 +1732,7 @@ contains
     logical, intent(in), optional :: mask(:)
     integer(psb_ipk_), intent(in), optional :: lidx(:)
 
-    integer(psb_ipk_) :: i, nv, is, ix, im
+    integer(psb_lpk_) :: i, nv, is, ix, im
     integer(psb_lpk_) :: ip, lip, lnxt
     integer(psb_ipk_) :: nxt
 
diff --git a/base/tools/psb_cd_renum_block.F90 b/base/tools/psb_cd_renum_block.F90
index 531d14df..1d64a09e 100644
--- a/base/tools/psb_cd_renum_block.F90
+++ b/base/tools/psb_cd_renum_block.F90
@@ -53,9 +53,9 @@ subroutine psb_cd_renum_block(desc_in, desc_out, info)
   type(psb_gen_block_map), allocatable :: blck_map
   integer(psb_ipk_), allocatable :: lidx(:),reflidx(:)
   integer(psb_lpk_), allocatable :: gidx(:),vnl(:)
-  integer(psb_ipk_) :: i,n_row, n_col
-  integer(psb_lpk_) :: li,n_glob_row, n_glob_col
-  integer(psb_ipk_) :: np,me,ictxt, err_act
+  integer(psb_ipk_) :: i, n_row, n_col
+  integer(psb_lpk_) :: li, n_glob_row, n_glob_col
+  integer(psb_ipk_) :: np, me, ictxt, err_act
   integer(psb_ipk_) :: debug_level, debug_unit
   character(len=20)   :: name
   
diff --git a/base/tools/psb_glob_to_loc.f90 b/base/tools/psb_glob_to_loc.f90
index 51b3f70d..79799d19 100644
--- a/base/tools/psb_glob_to_loc.f90
+++ b/base/tools/psb_glob_to_loc.f90
@@ -60,10 +60,9 @@ subroutine psb_glob_to_loc2v(x,y,desc_a,info,iact,owned)
 
   !....locals....
   integer(psb_ipk_) :: n, ictxt, iam, np 
-  character                          :: act
-  integer(psb_ipk_) :: int_err(5), err_act
-  integer(psb_ipk_), parameter                 :: zero=0
-  character(len=20)   :: name
+  character         :: act
+  integer(psb_ipk_) :: err_act
+  character(len=20) :: name
 
   if(psb_get_errstatus() /= 0) return 
   info=psb_success_
@@ -181,10 +180,9 @@ subroutine psb_glob_to_loc1v(x,desc_a,info,iact,owned)
 
   !....locals....
   integer(psb_ipk_) :: n
-  character                        :: act
+  character         :: act
   integer(psb_ipk_) :: err_act
-  integer(psb_ipk_), parameter               :: zero=0
-  character(len=20)   :: name
+  character(len=20) :: name
   integer(psb_ipk_) :: ictxt, iam, np
 
   if(psb_get_errstatus() /= 0) return