diff --git a/base/comm/internals/psi_dswapdata.F90 b/base/comm/internals/psi_dswapdata.F90
index f00d21b94..9b56e2824 100644
--- a/base/comm/internals/psi_dswapdata.F90
+++ b/base/comm/internals/psi_dswapdata.F90
@@ -365,8 +365,9 @@ subroutine psi_dswapidxm(iictxt,iicomm,flag,n,beta,y,idx, &
 
 
     ! Then I post all the blocking sends
+#ifndef SERIAL_MPI
     if (usersend)  call mpi_barrier(icomm,iret)
-
+#endif
     pnti   = 1
     snd_pt = 1
     rcv_pt = 1
@@ -376,17 +377,20 @@ subroutine psi_dswapidxm(iictxt,iicomm,flag,n,beta,y,idx, &
       nesd = idx(pnti+nerv+psb_n_elem_send_)
 
       p2ptag = psb_double_swap_tag
-      if ((nesd>0).and.(proc_to_comm /= me)) then 
-        if (usersend) then 
+      if ((nesd>0).and.(proc_to_comm /= me)) then
+#ifndef SERIAL_MPI
+        if (usersend) then
           call mpi_rsend(sndbuf(snd_pt),n*nesd,&
                & psb_mpi_r_dpk_,prcid(i),&
                & p2ptag,icomm,iret)
         else
+#endif
           call mpi_send(sndbuf(snd_pt),n*nesd,&
                & psb_mpi_r_dpk_,prcid(i),&
              & p2ptag,icomm,iret)
+#ifndef SERIAL_MPI
         end if
-
+#endif
         if(iret /= mpi_success) then
           ierr(1) = iret
           info=psb_err_mpi_error_
@@ -855,8 +859,9 @@ subroutine psi_dswapidxv(iictxt,iicomm,flag,beta,y,idx, &
 
 
     ! Then I post all the blocking sends
+#ifndef SERIAL_MPI
     if (usersend)  call mpi_barrier(icomm,iret)
-
+#endif
     pnti   = 1
     snd_pt = 1
     rcv_pt = 1
@@ -868,16 +873,19 @@ subroutine psi_dswapidxv(iictxt,iicomm,flag,beta,y,idx, &
       p2ptag = psb_double_swap_tag
 
       if ((nesd>0).and.(proc_to_comm /= me)) then 
+#ifndef SERIAL_MPI
         if (usersend) then 
           call mpi_rsend(sndbuf(snd_pt),nesd,&
                & psb_mpi_r_dpk_,prcid(i),&
                & p2ptag,icomm,iret)
         else
+#endif
           call mpi_send(sndbuf(snd_pt),nesd,&
                & psb_mpi_r_dpk_,prcid(i),&
                & p2ptag,icomm,iret)
+#ifndef SERIAL_MPI
         end if
-
+#endif
         if(iret /= mpi_success) then
           ierr(1) = iret
           info=psb_err_mpi_error_
diff --git a/base/comm/internals/psi_dswaptran.F90 b/base/comm/internals/psi_dswaptran.F90
index 604b345e6..2b328a2eb 100644
--- a/base/comm/internals/psi_dswaptran.F90
+++ b/base/comm/internals/psi_dswaptran.F90
@@ -376,8 +376,9 @@ subroutine psi_dtranidxm(iictxt,iicomm,flag,n,beta,y,idx,&
 
 
     ! Then I post all the blocking sends
+#ifndef SERIAL_MPI
     if (usersend)  call mpi_barrier(icomm,iret)
-
+#endif
     pnti   = 1
     snd_pt = 1
     rcv_pt = 1
@@ -388,16 +389,19 @@ subroutine psi_dtranidxm(iictxt,iicomm,flag,n,beta,y,idx,&
 
       if ((nerv>0).and.(proc_to_comm /= me)) then 
         p2ptag = psb_double_swap_tag
+#ifndef SERIAL_MPI
         if (usersend) then 
           call mpi_rsend(rcvbuf(rcv_pt),n*nerv,&
                & psb_mpi_r_dpk_,prcid(i),&
                & p2ptag,icomm,iret)
         else
+#endif
           call mpi_send(rcvbuf(rcv_pt),n*nerv,&
                & psb_mpi_r_dpk_,prcid(i),&
                & p2ptag,icomm,iret)
+#ifndef SERIAL_MPI
         end if
-
+#endif
         if(iret /= mpi_success) then
           ierr(1) = iret
           info=psb_err_mpi_error_
@@ -874,8 +878,9 @@ subroutine psi_dtranidxv(iictxt,iicomm,flag,beta,y,idx,&
 
 
     ! Then I post all the blocking sends
+#ifndef SERIAL_MPI
     if (usersend)  call mpi_barrier(icomm,iret)
-
+#endif
     pnti   = 1
     snd_pt = 1
     rcv_pt = 1
@@ -886,16 +891,19 @@ subroutine psi_dtranidxv(iictxt,iicomm,flag,beta,y,idx,&
 
       if ((nerv>0).and.(proc_to_comm /= me)) then 
         p2ptag = psb_double_swap_tag
+#ifndef SERIAL_MPI
         if (usersend) then 
           call mpi_rsend(rcvbuf(rcv_pt),nerv,&
                & psb_mpi_r_dpk_,prcid(i),&
                & p2ptag, icomm,iret)
         else
+#endif
           call mpi_send(rcvbuf(rcv_pt),nerv,&
                & psb_mpi_r_dpk_,prcid(i),&
                & p2ptag, icomm,iret)
+#ifndef SERIAL_MPI
         end if
-
+#endif
         if(iret /= mpi_success) then
           ierr(1) = iret
           info=psb_err_mpi_error_
diff --git a/base/modules/fakempi.c b/base/modules/fakempi.c
index 603a2445f..c37afe271 100644
--- a/base/modules/fakempi.c
+++ b/base/modules/fakempi.c
@@ -115,7 +115,7 @@ double mpi_wtime()
   double seconds;
 
   QueryPerformanceCounter(&tim);
-  QeryPerformanceFrequency(&freq);
+  QueryPerformanceFrequency(&freq);
   seconds = (double)(tim.QuadPart) / (double)(freq.QuadPart);
   return(seconds);
 #else