diff --git a/base/modules/psb_indx_map_mod.f90 b/base/modules/psb_indx_map_mod.f90
index 6ac55ded..9f5a8773 100644
--- a/base/modules/psb_indx_map_mod.f90
+++ b/base/modules/psb_indx_map_mod.f90
@@ -668,7 +668,7 @@ contains
     integer(psb_ipk_), intent(inout) :: idx
     integer(psb_ipk_), intent(out)   :: info 
     logical, intent(in), optional :: mask
-    integer, intent(in), optional :: lidx
+    integer(psb_ipk_), intent(in), optional :: lidx
     integer(psb_ipk_) :: err_act
     character(len=20)  :: name='base_g2l_ins'
     logical, parameter :: debug=.false.
@@ -695,7 +695,7 @@ contains
     integer(psb_ipk_), intent(out)   :: idxout
     integer(psb_ipk_), intent(out)   :: info 
     logical, intent(in), optional :: mask
-    integer, intent(in), optional :: lidx
+    integer(psb_ipk_), intent(in), optional :: lidx
 
     integer(psb_ipk_) :: err_act
     character(len=20)  :: name='base_g2l_ins'
@@ -723,7 +723,7 @@ contains
     integer(psb_ipk_), intent(inout) :: idx(:)
     integer(psb_ipk_), intent(out)   :: info 
     logical, intent(in), optional :: mask(:)
-    integer, intent(in), optional :: lidx(:)
+    integer(psb_ipk_), intent(in), optional :: lidx(:)
 
     integer(psb_ipk_) :: err_act
     character(len=20)  :: name='base_g2l_ins'
@@ -751,7 +751,7 @@ contains
     integer(psb_ipk_), intent(out)   :: idxout(:)
     integer(psb_ipk_), intent(out)   :: info 
     logical, intent(in), optional :: mask(:)
-    integer, intent(in), optional :: lidx(:)
+    integer(psb_ipk_), intent(in), optional :: lidx(:)
 
     integer(psb_ipk_) :: err_act
     character(len=20)  :: name='base_g2l_ins'
diff --git a/prec/impl/psb_c_bjacprec_impl.f90 b/prec/impl/psb_c_bjacprec_impl.f90
index 85566479..6143157f 100644
--- a/prec/impl/psb_c_bjacprec_impl.f90
+++ b/prec/impl/psb_c_bjacprec_impl.f90
@@ -147,7 +147,6 @@ subroutine psb_c_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work)
   else
     allocate(ww(n_col),aux(4*n_col),stat=info)
   endif
-  if (info == psb_success_) allocate(wv%v,mold=x%v)
 
   if (info /= psb_success_) then 
     call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate')
@@ -182,7 +181,7 @@ subroutine psb_c_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work)
 
       call wv1%mlt(cone,prec%dv,wv,czero,info,conjgx=trans_)
   
-      if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),wv,&
+      if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),wv1,&
            & beta,y,desc_data,info,&
            & trans=trans_,scale='U',choice=psb_none_,work=aux)
 
diff --git a/prec/impl/psb_d_bjacprec_impl.f90 b/prec/impl/psb_d_bjacprec_impl.f90
index f6bc44a2..58bd4f22 100644
--- a/prec/impl/psb_d_bjacprec_impl.f90
+++ b/prec/impl/psb_d_bjacprec_impl.f90
@@ -147,7 +147,6 @@ subroutine psb_d_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work)
   else
     allocate(ww(n_col),aux(4*n_col),stat=info)
   endif
-  if (info == psb_success_) allocate(wv%v,mold=x%v)
 
   if (info /= psb_success_) then 
     call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate')
@@ -182,7 +181,7 @@ subroutine psb_d_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work)
 
       call wv1%mlt(done,prec%dv,wv,dzero,info,conjgx=trans_)
   
-      if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),wv,&
+      if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),wv1,&
            & beta,y,desc_data,info,&
            & trans=trans_,scale='U',choice=psb_none_,work=aux)
 
diff --git a/prec/impl/psb_s_bjacprec_impl.f90 b/prec/impl/psb_s_bjacprec_impl.f90
index becefa6c..4f9f635e 100644
--- a/prec/impl/psb_s_bjacprec_impl.f90
+++ b/prec/impl/psb_s_bjacprec_impl.f90
@@ -147,7 +147,6 @@ subroutine psb_s_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work)
   else
     allocate(ww(n_col),aux(4*n_col),stat=info)
   endif
-  if (info == psb_success_) allocate(wv%v,mold=x%v)
 
   if (info /= psb_success_) then 
     call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate')
@@ -182,7 +181,7 @@ subroutine psb_s_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work)
 
       call wv1%mlt(sone,prec%dv,wv,szero,info,conjgx=trans_)
   
-      if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),wv,&
+      if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),wv1,&
            & beta,y,desc_data,info,&
            & trans=trans_,scale='U',choice=psb_none_,work=aux)
 
diff --git a/prec/impl/psb_z_bjacprec_impl.f90 b/prec/impl/psb_z_bjacprec_impl.f90
index 8942e0d7..1a42d106 100644
--- a/prec/impl/psb_z_bjacprec_impl.f90
+++ b/prec/impl/psb_z_bjacprec_impl.f90
@@ -147,7 +147,6 @@ subroutine psb_z_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work)
   else
     allocate(ww(n_col),aux(4*n_col),stat=info)
   endif
-  if (info == psb_success_) allocate(wv%v,mold=x%v)
 
   if (info /= psb_success_) then 
     call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate')
@@ -182,7 +181,7 @@ subroutine psb_z_bjac_apply_vect(alpha,prec,x,beta,y,desc_data,info,trans,work)
 
       call wv1%mlt(zone,prec%dv,wv,zzero,info,conjgx=trans_)
   
-      if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),wv,&
+      if(info == psb_success_)  call psb_spsm(alpha,prec%av(psb_l_pr_),wv1,&
            & beta,y,desc_data,info,&
            & trans=trans_,scale='U',choice=psb_none_,work=aux)