diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_active_target.c b/ompi/mca/osc/pt2pt/osc_pt2pt_active_target.c
index 22f9d1f7c4..e169addb54 100644
--- a/ompi/mca/osc/pt2pt/osc_pt2pt_active_target.c
+++ b/ompi/mca/osc/pt2pt/osc_pt2pt_active_target.c
@@ -339,8 +339,7 @@ int ompi_osc_pt2pt_complete (ompi_win_t *win)
     for (size_t i = 0 ; i < group_size ; ++i) {
         ompi_osc_pt2pt_header_complete_t complete_req;
         int rank = peers[i]->rank;
-        ompi_proc_t *proc = ompi_comm_peer_lookup (module->comm, rank);
-        
+
         if (my_rank == rank) {
             /* shortcut for self */
             osc_pt2pt_incoming_complete (module, rank, 0);
@@ -349,12 +348,14 @@ int ompi_osc_pt2pt_complete (ompi_win_t *win)
 
         complete_req.base.type = OMPI_OSC_PT2PT_HDR_TYPE_COMPLETE;
         complete_req.base.flags = OMPI_OSC_PT2PT_HDR_FLAG_VALID;
-#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT && OPAL_ENABLE_DEBUG
+        complete_req.frag_count = module->epoch_outgoing_frag_count[rank];
+#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
+#if OPAL_ENABLE_DEBUG
         complete_req.padding[0] = 0;
         complete_req.padding[1] = 0;
 #endif
-        complete_req.frag_count = module->epoch_outgoing_frag_count[rank];
-        osc_pt2pt_hton(&complete_req, proc);
+        osc_pt2pt_hton(&complete_req, ompi_comm_peer_lookup (module->comm, rank));
+#endif
 
         ompi_osc_pt2pt_peer_t *peer = ompi_osc_pt2pt_peer_lookup (module, rank);
 
diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c b/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c
index 74c6be1801..7e28914801 100644
--- a/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c
+++ b/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c
@@ -34,7 +34,10 @@ OBJ_CLASS_INSTANCE(ompi_osc_pt2pt_sync_t, opal_free_list_item_t,
 ompi_osc_pt2pt_sync_t *ompi_osc_pt2pt_sync_allocate (struct ompi_osc_pt2pt_module_t *module)
 {
     ompi_osc_pt2pt_sync_t *sync;
-#pragma unused (module)
+
+    /* module is not used yet */
+    (void) module;
+
     sync = OBJ_NEW (ompi_osc_pt2pt_sync_t);
     if (OPAL_UNLIKELY(NULL == sync)) {
         return NULL;