diff --git a/c/mpi/one-sided/osu_fop_latency.c b/c/mpi/one-sided/osu_fop_latency.c
index 30b167371c308364768163212df00ca56ad19e50..c3a2c4bea20722fc984e8513f1d74e3c78d29b97 100644
--- a/c/mpi/one-sided/osu_fop_latency.c
+++ b/c/mpi/one-sided/osu_fop_latency.c
@@ -372,6 +372,7 @@ void run_fop_with_flush(int rank, enum WINDOW win_type, MPI_Datatype data_type,
                                              tbuf, options.max_message_size, 0,
                                              1, &validation_error_flag);
                 MPI_CHECK(MPI_Barrier(omb_comm));
+                MPI_CHECK(MPI_Barrier(omb_comm));
             }
         }
         t_end = MPI_Wtime();
@@ -381,6 +382,7 @@ void run_fop_with_flush(int rank, enum WINDOW win_type, MPI_Datatype data_type,
         atomic_data_validation_check(data_type, op, rank, win_base, tbuf,
                                      options.max_message_size, 1, 0,
                                      &validation_error_flag);
+        MPI_CHECK(MPI_Barrier(omb_comm));
     }
 
     MPI_CHECK(MPI_Barrier(omb_comm));
diff --git a/c/mpi/pt2pt/standard/osu_latency_mt.c b/c/mpi/pt2pt/standard/osu_latency_mt.c
index a0aa30fe4014516b4590d4dc5869b5700c9e68ed..d6f15d5b2ae8b70d76a959d4cb6b224c2a60e4d3 100644
--- a/c/mpi/pt2pt/standard/osu_latency_mt.c
+++ b/c/mpi/pt2pt/standard/osu_latency_mt.c
@@ -574,11 +574,13 @@ omb_mpi_init_data omb_lat_mt_get_comm()
 
 void omb_lat_mt_session_finalize(omb_mpi_init_data omb_session_h)
 {
-    if (1 == options.omb_enable_session) {
 #ifdef _ENABLE_MPI4_
+    if (1 == options.omb_enable_session) {
         MPI_CHECK(MPI_Comm_free(&omb_session_h.omb_comm));
         MPI_CHECK(MPI_Session_finalize(&omb_session_h.omb_shandle));
-#endif
     }
+#else
+    MPI_CHECK(MPI_Finalize());
+#endif
 }
 /* vi: set sw=4 sts=4 tw=80: */