diff --git a/src/sst/elements/memHierarchy/standardInterface.cc b/src/sst/elements/memHierarchy/standardInterface.cc
index 0d4eb206fe..681a8861f4 100644
--- a/src/sst/elements/memHierarchy/standardInterface.cc
+++ b/src/sst/elements/memHierarchy/standardInterface.cc
@@ -525,7 +525,7 @@ Event* StandardInterface::MemEventConverter::convert(StandardMem::MoveData* req)
     return move;
 }
 Event* StandardInterface::MemEventConverter::convert(StandardMem::CustomReq* req) {
-    CustomMemEvent* creq = new CustomMemEvent(iface->getName(), Command::CustomReq, req->data);
+    CustomMemEvent* creq = new CustomMemEvent(iface->getName(), Command::CustomReq, req->releaseData());
     if (!req->needsResponse())
         creq->setFlag(MemEventBase::F_NORESPONSE);
 
@@ -620,7 +620,7 @@ StandardMem::Request* StandardInterface::convertResponseCustomResp(StandardMem::
     StandardMem::Request* resp = req->needsResponse() ? req->makeResponse() : nullptr;
     StandardMem::CustomResp* cresp = static_cast<StandardMem::CustomResp*>(resp);
     if (cresp) { 
-        cresp->data = static_cast<CustomMemEvent*>(meb)->getCustomData(); 
+        cresp->setData(static_cast<CustomMemEvent*>(meb)->getCustomData()); 
     }
     return cresp;
 }
diff --git a/src/sst/elements/miranda/mirandaCPU.cc b/src/sst/elements/miranda/mirandaCPU.cc
index 09e9b4f580..823c480938 100644
--- a/src/sst/elements/miranda/mirandaCPU.cc
+++ b/src/sst/elements/miranda/mirandaCPU.cc
@@ -265,7 +265,7 @@ void RequestGenCPU::StdMemHandler::handle(Interfaces::StandardMem::CustomResp* r
     cpu->requestsPending[CUSTOM]--;
     // The CustomResp destructor does not delete the data
     // Do not need to delete the cpuReq data as the memory system should take care of that
-    delete rsp->data;
+    delete rsp->releaseData();
 }
 
 void RequestGenCPU::issueCustomRequest(CustomOpRequest* req) {
diff --git a/src/sst/elements/osseous/Makefile.am b/src/sst/elements/osseous/Makefile.am
index 6f4dc66b73..5d05870594 100644
--- a/src/sst/elements/osseous/Makefile.am
+++ b/src/sst/elements/osseous/Makefile.am
@@ -2,7 +2,7 @@
 #
 #
 INCLUDE = -I$(top_srcdir)/src/sst/elements/osseous/eras_datatypes/ -I$(top_srcdir)/src/sst/elements/ariel/
-FLAGS = -fpermissive -std=c++11 
+FLAGS = -fpermissive -std=c++17
 
 
 AM_CPPFLAGS += \