diff --git a/ompi/mca/ptl/gm/ptl_gm.c b/ompi/mca/ptl/gm/ptl_gm.c
index e7b2281b53..3be7cb78db 100644
--- a/ompi/mca/ptl/gm/ptl_gm.c
+++ b/ompi/mca/ptl/gm/ptl_gm.c
@@ -402,7 +402,7 @@ mca_ptl_gm_matched( mca_ptl_base_module_t* ptl,
     
     /* Now update the status of the fragment */
     if( ((mca_ptl_gm_recv_frag_t*)frag)->have_allocated_buffer == true ) {
-        gm_release_local_buffer( ((mca_ptl_gm_recv_frag_t*)frag)->frag_recv.frag_base.frag_addr );
+        mca_ptl_gm_release_local_buffer( ((mca_ptl_gm_recv_frag_t*)frag)->frag_recv.frag_base.frag_addr );
         ((mca_ptl_gm_recv_frag_t*)frag)->have_allocated_buffer = false;
     }
     
diff --git a/ompi/mca/ptl/gm/ptl_gm.h b/ompi/mca/ptl/gm/ptl_gm.h
index 51769cfab5..e673160a2a 100644
--- a/ompi/mca/ptl/gm/ptl_gm.h
+++ b/ompi/mca/ptl/gm/ptl_gm.h
@@ -222,8 +222,8 @@ extern "C" {
      * Internally allocate memory for the unexpected messages. We will manage a list
      * of such buffers in order to avoid too many memory allocations.
      */
-    extern char* gm_get_local_buffer( void );
-    extern void gm_release_local_buffer( char* ptr );
+    extern char* mca_ptl_gm_get_local_buffer( void );
+    extern void mca_ptl_gm_release_local_buffer( char* ptr );
 
     union mca_ptl_base_header_t;
     void mca_ptl_gm_dump_header( char* str, union mca_ptl_base_header_t* hdr );
diff --git a/ompi/mca/ptl/gm/ptl_gm_component.c b/ompi/mca/ptl/gm/ptl_gm_component.c
index ddfa337f23..6afaa84d8c 100644
--- a/ompi/mca/ptl/gm/ptl_gm_component.c
+++ b/ompi/mca/ptl/gm/ptl_gm_component.c
@@ -557,7 +557,7 @@ mca_ptl_gm_component_control (int param, void *value, size_t size)
     return OMPI_SUCCESS;
 }
 
-char* gm_get_local_buffer( void )
+char* mca_ptl_gm_get_local_buffer( void )
 {
     opal_list_item_t* item;
     int rc;
@@ -566,7 +566,7 @@ char* gm_get_local_buffer( void )
     return (char*)item;
 }
 
-void gm_release_local_buffer( char* ptr )
+void mca_ptl_gm_release_local_buffer( char* ptr )
 {
     OMPI_GM_FREE_LIST_RETURN( &(mca_ptl_gm_component.gm_unexpected_frags_data), (opal_list_item_t*)ptr );
 }
diff --git a/ompi/mca/ptl/gm/ptl_gm_priv.c b/ompi/mca/ptl/gm/ptl_gm_priv.c
index a2491c81b4..c1152e6182 100644
--- a/ompi/mca/ptl/gm/ptl_gm_priv.c
+++ b/ompi/mca/ptl/gm/ptl_gm_priv.c
@@ -632,7 +632,7 @@ mca_ptl_gm_recv_frag_match( struct mca_ptl_gm_module_t *ptl,
 
     /* get some memory and copy the data inside. We can then release the receive buffer */
     if( 0 != recv_frag->attached_data_length ) {
-        char* ptr = (char*)gm_get_local_buffer();
+        char* ptr = (char*)mca_ptl_gm_get_local_buffer();
         recv_frag->have_allocated_buffer = true;
         memcpy( ptr, recv_frag->frag_recv.frag_base.frag_addr, recv_frag->attached_data_length );
         recv_frag->frag_recv.frag_base.frag_addr = ptr;
@@ -750,7 +750,7 @@ mca_ptl_gm_recv_frag_frag( struct mca_ptl_gm_module_t* ptl,
          */
         ompi_convertor_clone_with_position( &(request->req_recv.req_convertor),
                                             convertor, 1,
-                                            &(hdr->hdr_frag.hdr_frag_offset) );
+                                            (size_t*)&(hdr->hdr_frag.hdr_frag_offset) );
     }
 
     if( header_length != msg_len ) {