diff --git a/base/internals/psi_extrct_dl.F90 b/base/internals/psi_extrct_dl.F90
index 52773a6f..2007e072 100644
--- a/base/internals/psi_extrct_dl.F90
+++ b/base/internals/psi_extrct_dl.F90
@@ -132,7 +132,7 @@ subroutine psi_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,&
 #endif
   !     ....scalar parameters...
   logical :: is_bld, is_upd
-  integer(psb_mpik_) :: ictxt
+  integer(psb_ipk_) :: ictxt
   integer(psb_ipk_) :: np,dl_lda,mode, info
 
   !     ....array parameters....
@@ -145,17 +145,17 @@ subroutine psi_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,&
   integer(psb_ipk_) :: i,pointer_dep_list,proc,j,err_act
   integer(psb_ipk_) :: err
   integer(psb_ipk_) :: debug_level, debug_unit
-  integer(psb_mpik_) :: icomm, me, npr, dl_mpi, minfo
+  integer(psb_mpik_) :: iictxt, icomm, me, npr, dl_mpi, minfo
   character  name*20
   name='psi_extrct_dl'
 
   call psb_erractionsave(err_act)
   debug_unit  = psb_get_debug_unit()
   debug_level = psb_get_debug_level()
-
+  iictxt = ictxt 
   info = psb_success_
 
-  call psb_info(ictxt,me,npr)
+  call psb_info(iictxt,me,npr)
   do i=0,np 
     length_dl(i) = 0
   enddo
@@ -263,8 +263,8 @@ subroutine psi_extract_dep_list(ictxt,is_bld,is_upd,desc_str,dep_list,&
 
   if (err /= 0) goto 9999
 
-  call psb_sum(ictxt,length_dl(0:np))
-  call psb_get_mpicomm(ictxt,icomm )
+  call psb_sum(iictxt,length_dl(0:np))
+  call psb_get_mpicomm(iictxt,icomm )
   allocate(itmp(dl_lda),stat=info)
   if (info /= psb_success_) then 
     info=psb_err_alloc_dealloc_
diff --git a/base/modules/psb_hash_map_mod.f90 b/base/modules/psb_hash_map_mod.f90
index 8befac3e..41723041 100644
--- a/base/modules/psb_hash_map_mod.f90
+++ b/base/modules/psb_hash_map_mod.f90
@@ -1461,7 +1461,8 @@ contains
     implicit none 
     class(psb_hash_map), intent(inout)    :: idxmap
     integer(psb_ipk_), intent(out) :: info
-    integer(psb_ipk_) :: err_act, nr,nc,k, nl, ictxt, ntot, me, np
+    integer(psb_ipk_) :: err_act, nr,nc,k, nl, ntot
+    integer(psb_mpik_) :: ictxt, me, np
     integer(psb_ipk_), allocatable :: idx(:),lidx(:)
     character(len=20)  :: name='hash_reinit'
     logical, parameter :: debug=.false.
diff --git a/base/modules/psi_i_mod.f90 b/base/modules/psi_i_mod.f90
index 2cd122eb..6c836f24 100644
--- a/base/modules/psi_i_mod.f90
+++ b/base/modules/psi_i_mod.f90
@@ -103,7 +103,7 @@ module psi_i_mod
          & length_dl,np,dl_lda,mode,info)
       import :: psb_desc_type, psb_ipk_, psb_mpik_
       logical :: is_bld, is_upd
-      integer(psb_mpik_) :: ictxt
+      integer(psb_ipk_) :: ictxt
       integer(psb_ipk_) :: np,dl_lda,mode, info
       integer(psb_ipk_) :: desc_str(*),dep_list(dl_lda,0:np),length_dl(0:np)
     end subroutine psi_extract_dep_list
diff --git a/base/serial/impl/psb_c_base_mat_impl.F90 b/base/serial/impl/psb_c_base_mat_impl.F90
index 3af4fed0..85c8b67d 100644
--- a/base/serial/impl/psb_c_base_mat_impl.F90
+++ b/base/serial/impl/psb_c_base_mat_impl.F90
@@ -419,7 +419,7 @@ subroutine psb_c_base_csgetblk(imin,imax,a,b,info,&
   integer(psb_ipk_) :: err_act, nzin, nzout
   integer(psb_ipk_) :: ierr(5)
   character(len=20)  :: name='csget'
-  integer :: jmin_, jmax_
+  integer(psb_ipk_) :: jmin_, jmax_
   logical :: append_, rscale_, cscale_
   logical, parameter :: debug=.false.
 
diff --git a/base/serial/impl/psb_d_base_mat_impl.F90 b/base/serial/impl/psb_d_base_mat_impl.F90
index e41806b4..686cac82 100644
--- a/base/serial/impl/psb_d_base_mat_impl.F90
+++ b/base/serial/impl/psb_d_base_mat_impl.F90
@@ -419,7 +419,7 @@ subroutine psb_d_base_csgetblk(imin,imax,a,b,info,&
   integer(psb_ipk_) :: err_act, nzin, nzout
   integer(psb_ipk_) :: ierr(5)
   character(len=20)  :: name='csget'
-  integer :: jmin_, jmax_
+  integer(psb_ipk_) :: jmin_, jmax_
   logical :: append_, rscale_, cscale_
   logical, parameter :: debug=.false.
 
diff --git a/base/serial/impl/psb_s_base_mat_impl.F90 b/base/serial/impl/psb_s_base_mat_impl.F90
index e6e21040..5cdbd79f 100644
--- a/base/serial/impl/psb_s_base_mat_impl.F90
+++ b/base/serial/impl/psb_s_base_mat_impl.F90
@@ -419,7 +419,7 @@ subroutine psb_s_base_csgetblk(imin,imax,a,b,info,&
   integer(psb_ipk_) :: err_act, nzin, nzout
   integer(psb_ipk_) :: ierr(5)
   character(len=20)  :: name='csget'
-  integer :: jmin_, jmax_
+  integer(psb_ipk_) :: jmin_, jmax_
   logical :: append_, rscale_, cscale_
   logical, parameter :: debug=.false.
 
diff --git a/base/serial/impl/psb_z_base_mat_impl.F90 b/base/serial/impl/psb_z_base_mat_impl.F90
index 0faadd0e..34f6f343 100644
--- a/base/serial/impl/psb_z_base_mat_impl.F90
+++ b/base/serial/impl/psb_z_base_mat_impl.F90
@@ -419,7 +419,7 @@ subroutine psb_z_base_csgetblk(imin,imax,a,b,info,&
   integer(psb_ipk_) :: err_act, nzin, nzout
   integer(psb_ipk_) :: ierr(5)
   character(len=20)  :: name='csget'
-  integer :: jmin_, jmax_
+  integer(psb_ipk_) :: jmin_, jmax_
   logical :: append_, rscale_, cscale_
   logical, parameter :: debug=.false.