diff --git a/ompi/mca/coll/tuned/coll_tuned_allgather.c b/ompi/mca/coll/tuned/coll_tuned_allgather.c
index 0bed21a68d..bc6ab373b3 100644
--- a/ompi/mca/coll/tuned/coll_tuned_allgather.c
+++ b/ompi/mca/coll/tuned/coll_tuned_allgather.c
@@ -89,7 +89,7 @@ int ompi_coll_tuned_allgather_intra_bruck(void *sbuf, int scount,
    int rank, size;
    int sendto, recvfrom, distance, blockcount;
    int err = 0;
-   ptrdiff_t slb, rlb, true_extent, sext, rext;
+   ptrdiff_t slb, rlb, sext, rext;
    char *tmpsend = NULL, *tmprecv = NULL;
    ompi_request_t *reqs[2] = {NULL, NULL};
 
@@ -385,7 +385,7 @@ int ompi_coll_tuned_allgather_intra_ring(void *sbuf, int scount,
    int rank, size;
    int sendto, recvfrom, i, recvdatafrom, senddatafrom;
    int err = 0;
-   ptrdiff_t slb, rlb, true_extent, sext, rext;
+   ptrdiff_t slb, rlb, sext, rext;
    char *tmpsend = NULL, *tmprecv = NULL;
    ompi_request_t *reqs[2] = {NULL, NULL};
 
@@ -523,7 +523,7 @@ ompi_coll_tuned_allgather_intra_neighborexchange(void *sbuf, int scount,
    int neighbor[2], offset_at_step[2], recv_data_from[2], send_data_from;
    int i, even_rank;
    int err = 0;
-   ptrdiff_t slb, rlb, true_extent, sext, rext;
+   ptrdiff_t slb, rlb, sext, rext;
    char *tmpsend = NULL, *tmprecv = NULL;
    ompi_request_t *reqs[2] = {NULL, NULL};
 
@@ -648,6 +648,7 @@ int ompi_coll_tuned_allgather_intra_two_procs(void *sbuf, int scount,
    int remote;
    char *tmpsend = NULL, *tmprecv = NULL;
    ptrdiff_t sext, rext, lb;
+   ompi_request_t *reqs[2] = {NULL, NULL};
 
    rank = ompi_comm_rank(comm);
 
@@ -671,8 +672,6 @@ int ompi_coll_tuned_allgather_intra_two_procs(void *sbuf, int scount,
       tmpsend = (char*)rbuf + rank * rcount * rext;
    }
    tmprecv = (char*)rbuf + remote * rcount * rext;
-   ompi_request_t *reqs[2] = {NULL, NULL};
-
 
    err = MCA_PML_CALL(irecv(tmprecv, rcount, rdtype, remote, 
                             MCA_COLL_BASE_TAG_ALLGATHER, comm, &reqs[0]));
diff --git a/ompi/mca/coll/tuned/coll_tuned_alltoall.c b/ompi/mca/coll/tuned/coll_tuned_alltoall.c
index ce1aaba952..2491ab60fe 100644
--- a/ompi/mca/coll/tuned/coll_tuned_alltoall.c
+++ b/ompi/mca/coll/tuned/coll_tuned_alltoall.c
@@ -213,11 +213,6 @@ int ompi_coll_tuned_alltoall_intra_bruck(void *sbuf, int scount,
         }
     }
 
- 
-    if (err<0) {
-        line = __LINE__; err = -1; goto err_hndl;
-    }
-
     /* Step 4 - clean up */
     if (tmpbuf != NULL) free(tmpbuf);
     if (packbuf != NULL) free(packbuf);
@@ -225,7 +220,6 @@ int ompi_coll_tuned_alltoall_intra_bruck(void *sbuf, int scount,
         if (displs != NULL) free(displs);
         if (blen != NULL) free(blen);
     }
-
     return OMPI_SUCCESS;
 
  err_hndl:
@@ -237,7 +231,6 @@ int ompi_coll_tuned_alltoall_intra_bruck(void *sbuf, int scount,
         if (blen != NULL) free(blen);
     }
     return err;
-
 }
 
 
diff --git a/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c b/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c
index 03eccdae3a..78dacd8705 100644
--- a/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c
+++ b/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c
@@ -392,7 +392,7 @@ int ompi_coll_tuned_allgather_intra_dec_fixed(void *sbuf, int scount,
       }
    }
    
-#if USE_MPICH2_DECISION      
+#if defined(USE_MPICH2_DECISION)
    /* Decision as in MPICH-2 
       presented in Thakur et.al. "Optimization of Collective Communication 
       Operations in MPICH", International Journal of High Performance Computing 
@@ -412,5 +412,5 @@ int ompi_coll_tuned_allgather_intra_dec_fixed(void *sbuf, int scount,
    } 
    return ompi_coll_tuned_allgather_intra_ring(sbuf, scount, sdtype, 
                                                rbuf, rcount, rdtype, comm);
-#endif
+#endif  /* defined(USE_MPICH2_DECISION) */
 }