diff --git a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp
index 184762f691..e4e282ca26 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp
@@ -131,6 +131,7 @@ CALGSLContext::open(
 
     m_cs->setRenderState(m_rs);
     m_rs->setCurrentFrameBufferObject(m_cs, m_fb);
+    m_cs->createSubAllocDesc();
 
     //
     //
@@ -265,6 +266,7 @@ CALGSLContext::close(gsl::gsAdaptor* native)
 
     m_cs->destroyFrameBuffer(m_fb);
     m_cs->destroyRenderState(m_rs);
+    m_cs->destroySubAllocDesc();
 
     m_rs = 0;
     m_fb = 0;
@@ -319,7 +321,7 @@ CALGSLContext::setConstantBuffer(uint32 physUnit, gslMemObject mem, uint32 offse
         m_rs->setConstantBufferObject(GSL_COMPUTE_PROGRAM, m_constantBuffers[physUnit], physUnit);
     }
 
-    return m_constantBuffers[physUnit]->SetMemory(m_cs, mem, static_cast<mcoffset>(offset), (uint32)size);
+    return m_constantBuffers[physUnit]->bindMemory(m_cs, mem, static_cast<mcoffset>(offset), (uint32)size);
 }
 
 bool
diff --git a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp
index a385df7d6e..5596c938ce 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp
@@ -331,6 +331,7 @@ CALGSLDevice::close()
 
         m_cs->setRenderState(0);
         m_cs->destroyRenderState(m_rs);
+        m_cs->destroySubAllocDesc();
         m_rs = 0;
 
         m_adp->deleteContext(m_cs);
@@ -631,6 +632,8 @@ CALGSLDevice::PerformFullInitialization_int()
 
         m_cs->Flush();
 
+        m_cs->createSubAllocDesc();
+
         m_mapQuery = m_cs->createQuery(GSL_SYNC_ATI);
         m_mapDMAQuery = m_cs->createQuery(GSL_DRMDMA_SYNC_ATI);
         m_mapUVDQuery = m_cs->createQuery(GSL_UVD_SYNC_ATI);