diff --git a/ompi/mca/fs/pvfs2/fs_pvfs2.h b/ompi/mca/fs/pvfs2/fs_pvfs2.h
index 01bc4efa66c..2555996e861 100644
--- a/ompi/mca/fs/pvfs2/fs_pvfs2.h
+++ b/ompi/mca/fs/pvfs2/fs_pvfs2.h
@@ -48,7 +48,7 @@ BEGIN_C_DECLS
 struct mca_fs_pvfs2_s {
     PVFS_credentials credentials;
     PVFS_object_ref object_ref;
-} mca_fs_pvfs2_s;
+};
 typedef struct mca_fs_pvfs2_s mca_fs_pvfs2;
 
 int mca_fs_pvfs2_component_init_query(bool enable_progress_threads,
diff --git a/ompi/mca/io/ompio/io_ompio_aggregators.c b/ompi/mca/io/ompio/io_ompio_aggregators.c
index 92e3fd40cb0..0c7938673f9 100644
--- a/ompi/mca/io/ompio/io_ompio_aggregators.c
+++ b/ompi/mca/io/ompio/io_ompio_aggregators.c
@@ -442,7 +442,7 @@ int mca_io_ompio_create_groups(mca_io_ompio_file_t *fh,
                                         &ompio_grouping_flag);
     if ( OMPI_SUCCESS != ret ) {
         opal_output (1, "mca_io_ompio_create_groups: error in mca_io_ompio_prepare_to_group\n");
-        return ret;
+        goto exit;
     }
 
     switch(ompio_grouping_flag){
@@ -471,7 +471,7 @@ int mca_io_ompio_create_groups(mca_io_ompio_file_t *fh,
     }
     if ( OMPI_SUCCESS != ret ) {
         opal_output (1, "mca_io_ompio_create_groups: error in subroutine called within switch statement\n");
-        return ret;
+        goto exit;
     }
     
     //Set aggregator index
@@ -490,27 +490,13 @@ int mca_io_ompio_create_groups(mca_io_ompio_file_t *fh,
                                              fh->f_comm->c_coll.coll_allreduce_module);
     if ( OMPI_SUCCESS != ret ) {
         opal_output (1, "mca_io_ompio_create_groups: error in allreduce\n");
-        return ret;
     }
     
     //Set final number of aggregators in file handle
     fh->f_final_num_aggrs = final_num_aggrs;
 
-    //Print final number of aggregators if required
-    /*if(fh->f_rank == 0){
-        printf("Rank %d : has final_num_aggrs = %d\n",fh->f_rank,final_num_aggrs);
-    }*/
-
-    //Print final grouping
-    /*if (fh->f_procs_in_group[fh->f_aggregator_index] == fh->f_rank)  {
-        for (j=0 ; j<fh->f_procs_per_group; j++) {
-            printf ("%d: Proc %d: %d\n", fh->f_rank, j, fh->f_procs_in_group[j]);
-        }
-
-	printf("\n\n");
-    }
+exit:
 
-   */
     if (NULL != start_offsets_lens) {
         free (start_offsets_lens);
         start_offsets_lens =  NULL;