diff --git a/src/sst/elements/mask-mpi/mpi_protocol/eager0.cc b/src/sst/elements/mask-mpi/mpi_protocol/eager0.cc
index 5dc8ea5bb8..03ca5e1099 100644
--- a/src/sst/elements/mask-mpi/mpi_protocol/eager0.cc
+++ b/src/sst/elements/mask-mpi/mpi_protocol/eager0.cc
@@ -86,7 +86,7 @@ Eager0::incoming(MpiMessage *msg, MpiQueueRecvRequest *req)
 {
   //1 = stage, TimeDelay() = time since last quiesce
   logRecvDelay(1, SST::Hg::TimeDelta(), msg, req);
-  if (req->recv_buffer_){
+  if (isNonNullBuffer(req->recv_buffer_)){
 #if SST_HG_SANITY_CHECK
     if (!msg->smsgBuffer()){
       spkt_abort_printf("have receive buffer, but no send buffer on %s", msg->toString().c_str());
diff --git a/src/sst/elements/mask-mpi/mpi_protocol/eager1.cc b/src/sst/elements/mask-mpi/mpi_protocol/eager1.cc
index 5f98a3320c..1d0dc05373 100644
--- a/src/sst/elements/mask-mpi/mpi_protocol/eager1.cc
+++ b/src/sst/elements/mask-mpi/mpi_protocol/eager1.cc
@@ -105,7 +105,7 @@ Eager1::incoming(MpiMessage *msg, MpiQueueRecvRequest* req)
 {
   //1 = stage, TimeDelay() = time since last quiesce
   logRecvDelay(1, SST::Hg::TimeDelta(), msg, req);
-  if (req->recv_buffer_){
+  if (isNonNullBuffer(req->recv_buffer_)){
     char* temp_recv_buf = (char*) msg->localBuffer();
 #if SST_HG_SANITY_CHECK
     if (!temp_recv_buf){
diff --git a/src/sst/elements/mercury/components/node_base.h b/src/sst/elements/mercury/components/node_base.h
index 23863fdd11..ec7c0e2182 100644
--- a/src/sst/elements/mercury/components/node_base.h
+++ b/src/sst/elements/mercury/components/node_base.h
@@ -43,8 +43,8 @@ class NodeBase : public SST::Hg::Component {
   )
 
   SST_ELI_DOCUMENT_SUBCOMPONENT_SLOTS(
-      {"os_slot", "The operating system", "hg.operating_system"},
-      {"nic_slot", "The nic", "hg.nic"},
+      {"os_slot", "The operating system", "SST::Hg::OperatingSystemAPI"},
+      {"nic_slot", "The nic", "SST::Hg::NicAPI"},
       {"link_control_slot", "Slot for a link control", "SST::Interfaces::SimpleNetwork" }
       )