diff --git a/ompi/mca/mtl/portals4/mtl_portals4_component.c b/ompi/mca/mtl/portals4/mtl_portals4_component.c
index 9a8cd230a9..c60f03dc12 100644
--- a/ompi/mca/mtl/portals4/mtl_portals4_component.c
+++ b/ompi/mca/mtl/portals4/mtl_portals4_component.c
@@ -116,7 +116,10 @@ ompi_mtl_portals4_component_open(void)
     } else if (0 == strcmp(tmp_proto, "rndv")) {
         ompi_mtl_portals4.protocol = rndv;
     } else if (0 == strcmp(tmp_proto, "triggered")) {
-        ompi_mtl_portals4.protocol = triggered;
+        /* BWB: FIX ME */
+        opal_output(ompi_mtl_base_output,
+                    "WARNING: Triggered long protocol currently does not work.  Setting to eager.\n");
+        ompi_mtl_portals4.protocol = eager;
     } else {
         opal_output(ompi_mtl_base_output,
                     "Unknown protocol type %s", tmp_proto);
@@ -176,9 +179,6 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
                     PTL_PID_ANY,
                     NULL,
                     NULL,
-                    0,
-                    NULL,
-                    NULL,
                     &ompi_mtl_portals4.ni_h);
     if (PTL_OK != ret) {
         opal_output(ompi_mtl_base_output,
@@ -263,7 +263,7 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
         me.length = 0;
         me.ct_handle = PTL_CT_NONE;
         me.min_free = 0;
-        me.ac_id.uid = PTL_UID_ANY;
+        me.uid = PTL_UID_ANY;
         me.options = PTL_ME_OP_PUT | PTL_ME_ACK_DISABLE | PTL_ME_EVENT_COMM_DISABLE | PTL_ME_EVENT_UNLINK_DISABLE;
         me.match_id.phys.nid = PTL_NID_ANY;
         me.match_id.phys.pid = PTL_PID_ANY;
@@ -374,9 +374,6 @@ ompi_mtl_portals4_get_error(int ptl_error)
     case PTL_PT_IN_USE:
         ret = OMPI_ERR_RESOURCE_BUSY;
         break;
-    case PTL_SIZE_INVALID:
-        ret = OMPI_ERR_BAD_PARAM;
-        break;
     default:
         ret = OMPI_ERROR;
     }
diff --git a/ompi/mca/mtl/portals4/mtl_portals4_recv.c b/ompi/mca/mtl/portals4/mtl_portals4_recv.c
index 27478523b0..4e5822b61f 100644
--- a/ompi/mca/mtl/portals4/mtl_portals4_recv.c
+++ b/ompi/mca/mtl/portals4/mtl_portals4_recv.c
@@ -454,7 +454,7 @@ ompi_mtl_portals4_irecv(struct mca_mtl_base_module_t* mtl,
         me.ct_handle = PTL_CT_NONE;
     }
     me.min_free = 0;
-    me.ac_id.uid = PTL_UID_ANY;
+    me.uid = PTL_UID_ANY;
     me.options = PTL_ME_OP_PUT | PTL_ME_USE_ONCE | PTL_ME_EVENT_UNLINK_DISABLE;
     if (ompi_mtl_portals4.protocol == triggered && length > ompi_mtl_portals4.eager_limit) {
         me.options |= PTL_ME_EVENT_CT_COMM | PTL_ME_EVENT_CT_OVERFLOW | PTL_ME_EVENT_CT_BYTES | PTL_ME_ACK_DISABLE;
diff --git a/ompi/mca/mtl/portals4/mtl_portals4_recv_short.c b/ompi/mca/mtl/portals4/mtl_portals4_recv_short.c
index 309a445dc6..29ebdc5810 100644
--- a/ompi/mca/mtl/portals4/mtl_portals4_recv_short.c
+++ b/ompi/mca/mtl/portals4/mtl_portals4_recv_short.c
@@ -87,7 +87,7 @@ ompi_mtl_portals4_activate_block(ompi_mtl_portals4_recv_short_block_t *block)
     } else {
         me.min_free = block->mtl->eager_limit + 8;
     }
-    me.ac_id.uid = PTL_UID_ANY;
+    me.uid = PTL_UID_ANY;
     me.options = PTL_ME_OP_PUT | PTL_ME_MANAGE_LOCAL | PTL_ME_NO_TRUNCATE | 
         PTL_ME_MAY_ALIGN | PTL_ME_ACK_DISABLE | PTL_ME_EVENT_COMM_DISABLE;
     me.match_id.phys.nid = PTL_NID_ANY;
diff --git a/ompi/mca/mtl/portals4/mtl_portals4_send.c b/ompi/mca/mtl/portals4/mtl_portals4_send.c
index c281094b95..2d2c585254 100644
--- a/ompi/mca/mtl/portals4/mtl_portals4_send.c
+++ b/ompi/mca/mtl/portals4/mtl_portals4_send.c
@@ -249,7 +249,7 @@ ompi_mtl_portals4_long_isend(void *start, int length, int contextid, int localra
     me.length = length;
     me.ct_handle = PTL_CT_NONE;
     me.min_free = 0;
-    me.ac_id.uid = PTL_UID_ANY;
+    me.uid = PTL_UID_ANY;
     me.options = PTL_ME_OP_GET | PTL_ME_USE_ONCE | PTL_ME_EVENT_UNLINK_DISABLE;
     me.match_id = endpoint->ptl_proc;
     if (ompi_mtl_portals4.protocol == rndv) {
@@ -368,7 +368,7 @@ ompi_mtl_portals4_sync_isend(void *start, int length, int contextid, int localra
     me.length = 0;
     me.ct_handle = PTL_CT_NONE;
     me.min_free = 0;
-    me.ac_id.uid = PTL_UID_ANY;
+    me.uid = PTL_UID_ANY;
     me.options = PTL_ME_OP_PUT | PTL_ME_USE_ONCE;
     me.match_id = endpoint->ptl_proc;
     me.match_bits = endpoint->send_count;