diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c
index da247995ef..a48b5fb3fd 100644
--- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c
+++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c
@@ -11,6 +11,8 @@
  *                         All rights reserved.
  * Copyright (c) 2008-2010 Oracle and/or its affiliates.  All rights reserved
  * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -383,7 +385,7 @@ int mca_btl_tcp2_proc_insert( mca_btl_tcp2_proc_t* btl_proc,
        Network Byte Order) and expect all information received to
        be in NBO.  Since big endian machines always send and receive
        in NBO, we don't care so much about that case. */
-    if (btl_proc->proc_ompi->proc_arch & OPAL_ARCH_ISBIGENDIAN) {
+    if (btl_proc->proc_ompi->super.proc_arch & OPAL_ARCH_ISBIGENDIAN) {
         btl_endpoint->endpoint_nbo = true;
     }
 #endif
diff --git a/ompi/mca/osc/rdma/osc_rdma_data_move.c b/ompi/mca/osc/rdma/osc_rdma_data_move.c
index a7e65c09e9..d9fb9658ac 100644
--- a/ompi/mca/osc/rdma/osc_rdma_data_move.c
+++ b/ompi/mca/osc/rdma/osc_rdma_data_move.c
@@ -12,6 +12,8 @@
  *                         reserved. 
  * Copyright (c) 2009-2011 Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2012-2013 Sandia National Laboratories.  All rights reserved.
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -575,7 +577,7 @@ static inline int osc_rdma_accumulate_buffer (void *target, void *source, size_t
     }
 
 #if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
-    if (proc->proc_arch != ompi_proc_local()->proc_arch) {
+    if (proc->super.proc_arch != ompi_proc_local()->super.proc_arch) {
         ompi_datatype_t *primitive_datatype = NULL;
         uint32_t primitive_count;
         size_t buflen;
@@ -601,7 +603,7 @@ static inline int osc_rdma_accumulate_buffer (void *target, void *source, size_t
                                    count, op);
 
 #if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
-    if (proc->proc_arch != ompi_proc_local()->proc_arch) {
+    if (proc->super.proc_arch != ompi_proc_local()->super.proc_arch) {
         free(buffer);
     }
 #endif
diff --git a/oshmem/proc/proc.c b/oshmem/proc/proc.c
index fa39e66a35..d263a2e504 100644
--- a/oshmem/proc/proc.c
+++ b/oshmem/proc/proc.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 2013      Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -500,7 +502,7 @@ int oshmem_proc_unpack(opal_buffer_t* buf,
             /* if arch is different than mine, create a new convertor for this proc */
             if (plist[i]->super.proc_arch != opal_local_arch) {
 #if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
-                OBJ_RELEASE(plist[i]->proc_convertor);
+                OBJ_RELEASE(plist[i]->super.proc_convertor);
                 plist[i]->super.proc_convertor = opal_convertor_create(plist[i]->super.proc_arch, 0);
 #else
                 orte_show_help("help-shmem-runtime.txt",