diff --git a/ompi/mca/pml/dr/pml_dr_endpoint.h b/ompi/mca/pml/dr/pml_dr_endpoint.h
index 32e6e30ec5..d296a267ad 100644
--- a/ompi/mca/pml/dr/pml_dr_endpoint.h
+++ b/ompi/mca/pml/dr/pml_dr_endpoint.h
@@ -40,7 +40,7 @@ struct mca_pml_dr_endpoint_t {
     ompi_seq_tracker_t seq_sends; /**< Tracks the send vfrags that have been acked */ 
     ompi_seq_tracker_t seq_recvs; /**< Tracks the receive vfrags that have been acked */ 
     ompi_seq_tracker_t seq_recvs_matched; /**< Tracks the received vfrags that have been matched */ 
-    uint32_t vfrag_seq;             /**< current virtual fragment identifier sequence */
+    int32_t vfrag_seq;             /**< current virtual fragment identifier sequence */
 };
 typedef struct mca_pml_dr_endpoint_t mca_pml_dr_endpoint_t;
 OBJ_CLASS_DECLARATION(mca_pml_dr_endpoint_t);
diff --git a/ompi/mca/pml/dr/pml_dr_recvreq.h b/ompi/mca/pml/dr/pml_dr_recvreq.h
index 2d25d47a2a..a081d2fba5 100644
--- a/ompi/mca/pml/dr/pml_dr_recvreq.h
+++ b/ompi/mca/pml/dr/pml_dr_recvreq.h
@@ -363,7 +363,7 @@ do {                                                                          \
        int rc;                                                                \
                                                                               \
        vfrag = NULL;                                                          \
-       OPAL_THREAD_LOCK(&(recvreq)->req_mutex);                               \
+       OPAL_THREAD_LOCK(recvreq->req_mutex);                                  \
        for(item =  opal_list_get_first(&(recvreq)->req_vfrags);               \
            item != opal_list_get_end(&(recvreq)->req_vfrags);                 \
            item =  opal_list_get_next(item)) {                                \
@@ -388,7 +388,7 @@ do {                                                                          \
                (recvreq)->req_vfrag = vfrag;                                  \
            }                                                                  \
        }                                                                      \
-       OPAL_THREAD_UNLOCK(&(recvreq)->req_mutex);                             \
+       OPAL_THREAD_UNLOCK(recvreq->req_mutex);                                \
    }                                                                          \
 } while(0)
 
diff --git a/ompi/mca/pml/dr/pml_dr_sendreq.c b/ompi/mca/pml/dr/pml_dr_sendreq.c
index 9f8c2a1d53..b70aeba62d 100644
--- a/ompi/mca/pml/dr/pml_dr_sendreq.c
+++ b/ompi/mca/pml/dr/pml_dr_sendreq.c
@@ -125,7 +125,7 @@ static void mca_pml_dr_error_completion(
     }
 
     /* update pending counts */
-    OPAL_THREAD_ADD32(&sendreq->req_pipeline_depth,-1);
+    OPAL_THREAD_ADD_SIZE_T(&sendreq->req_pipeline_depth,-1);
     OPAL_THREAD_ADD64(&vfrag->vf_pending,-1);
 
     /* reset vfrag state - select new BTL */
@@ -163,7 +163,7 @@ static void mca_pml_dr_match_completion(
     }
 
     /* wait for local completion */
-    OPAL_THREAD_ADD32(&sendreq->req_pipeline_depth,-1);
+    OPAL_THREAD_ADD_SIZE_T(&sendreq->req_pipeline_depth,-1);
     if(OPAL_THREAD_ADD64(&vfrag->vf_pending,-1) > 0) 
         return;
 
@@ -227,7 +227,7 @@ static void mca_pml_dr_rndv_completion(
     }
 
     /* local completion */
-    OPAL_THREAD_ADD32(&sendreq->req_pipeline_depth,-1);
+    OPAL_THREAD_ADD_SIZE_T(&sendreq->req_pipeline_depth,-1);
     if(OPAL_THREAD_ADD64(&vfrag->vf_pending,-1) > 0)
         return;
     
diff --git a/ompi/mca/pml/dr/pml_dr_sendreq.h b/ompi/mca/pml/dr/pml_dr_sendreq.h
index 4fceb36b92..48bd75cbd1 100644
--- a/ompi/mca/pml/dr/pml_dr_sendreq.h
+++ b/ompi/mca/pml/dr/pml_dr_sendreq.h
@@ -363,7 +363,7 @@ do {                                                                 \
     OPAL_OUTPUT((0, "%s:%d:%s: retransmitting eager\n", __FILE__, __LINE__, __func__)); \
     assert(sendreq->req_descriptor->des_src != NULL);                \
                                                                      \
-    OPAL_THREAD_ADD32(&sendreq->req_pipeline_depth,1);               \
+    OPAL_THREAD_ADD_SIZE_T(&sendreq->req_pipeline_depth,1);          \
     OPAL_THREAD_ADD64(&(vfrag)->vf_pending,1);                       \
     (vfrag)->vf_state &= ~MCA_PML_DR_VFRAG_NACKED;                   \
                                                                      \
@@ -392,7 +392,7 @@ do {                                                                 \
     mca_pml_dr_hdr_t *hdr;                                           \
                                                                      \
     opal_output(0, "%s:%d:%s: (re)transmitting rndv probe\n", __FILE__, __LINE__, __func__); \
-    OPAL_THREAD_ADD32(&sendreq->req_pipeline_depth,1);               \
+    OPAL_THREAD_ADD_SIZE_T(&sendreq->req_pipeline_depth,1);          \
     OPAL_THREAD_ADD64(&vfrag->vf_pending,1);                         \
     (vfrag)->vf_state &= ~MCA_PML_DR_VFRAG_NACKED;                   \
                                                                      \
diff --git a/ompi/mca/pml/dr/pml_dr_vfrag.c b/ompi/mca/pml/dr/pml_dr_vfrag.c
index 9dba2d71e9..b5adbbc70d 100644
--- a/ompi/mca/pml/dr/pml_dr_vfrag.c
+++ b/ompi/mca/pml/dr/pml_dr_vfrag.c
@@ -73,7 +73,7 @@ static void mca_pml_dr_vfrag_wdog_timeout(int fd, short event, void* data)
     OPAL_OUTPUT((0, "%s:%d:%s: wdog timeout: 0x%08x", __FILE__, __LINE__, __func__, vfrag));
 
     /* update pending counts */
-    OPAL_THREAD_ADD32(&sendreq->req_pipeline_depth,-vfrag->vf_pending);
+    OPAL_THREAD_ADD_SIZE_T(&sendreq->req_pipeline_depth,-vfrag->vf_pending);
     OPAL_THREAD_ADD64(&vfrag->vf_pending,-vfrag->vf_pending);
 
     /* check for hung btl */
diff --git a/ompi/mca/pml/dr/pml_dr_vfrag.h b/ompi/mca/pml/dr/pml_dr_vfrag.h
index 66a2593633..5b0d4e4993 100644
--- a/ompi/mca/pml/dr/pml_dr_vfrag.h
+++ b/ompi/mca/pml/dr/pml_dr_vfrag.h
@@ -45,7 +45,7 @@ struct mca_pml_dr_vfrag_t {
     size_t     vf_max_send_size;
     uint64_t   vf_ack;
     uint64_t   vf_mask;
-    uint64_t   vf_pending;
+    int64_t    vf_pending;
     uint32_t   vf_state;
     struct mca_bml_base_btl_t* bml_btl;