diff --git a/renderdoc/core/resource_manager.h b/renderdoc/core/resource_manager.h
index b9a58a217..1e7626800 100644
--- a/renderdoc/core/resource_manager.h
+++ b/renderdoc/core/resource_manager.h
@@ -700,7 +700,7 @@ protected:
   virtual bool Serialise_InitialState(WriteSerialiser &ser, ResourceId id, RecordType *record,
                                       const InitialContentData *initialData) = 0;
   virtual void Create_InitialState(ResourceId id, WrappedResourceType live, bool hasData) = 0;
-  virtual void Apply_InitialState(WrappedResourceType live, const InitialContentData &initial) = 0;
+  virtual void Apply_InitialState(WrappedResourceType live, InitialContentData &initial) = 0;
   virtual rdcarray<ResourceId> InitialContentResources();
 
   void UpdateLastWriteTime(ResourceId id, FrameRefType refType);
@@ -1377,7 +1377,7 @@ void ResourceManager<Configuration>::ApplyInitialContents()
   for(auto it = resources.begin(); it != resources.end(); ++it)
   {
     ResourceId id = *it;
-    const InitialContentStorage &data = m_InitialContents[id];
+    InitialContentStorage &data = m_InitialContents[id];
     WrappedResourceType live = GetLiveResource(id);
     Apply_InitialState(live, data.data);
   }
diff --git a/renderdoc/driver/d3d11/d3d11_device.h b/renderdoc/driver/d3d11/d3d11_device.h
index 40ebf361f..51a2ed889 100644
--- a/renderdoc/driver/d3d11/d3d11_device.h
+++ b/renderdoc/driver/d3d11/d3d11_device.h
@@ -767,7 +767,7 @@ public:
                               const D3D11InitialContents *initial);
 
   void Create_InitialState(ResourceId id, ID3D11DeviceChild *live, bool hasData);
-  void Apply_InitialState(ID3D11DeviceChild *live, const D3D11InitialContents &initial);
+  void Apply_InitialState(ID3D11DeviceChild *live, D3D11InitialContents &initial);
 
   void SetStructuredExport(uint64_t sectionVersion)
   {
diff --git a/renderdoc/driver/d3d11/d3d11_initstate.cpp b/renderdoc/driver/d3d11/d3d11_initstate.cpp
index 2a58260ee..c786591fc 100644
--- a/renderdoc/driver/d3d11/d3d11_initstate.cpp
+++ b/renderdoc/driver/d3d11/d3d11_initstate.cpp
@@ -1297,8 +1297,7 @@ void WrappedID3D11Device::Create_InitialState(ResourceId id, ID3D11DeviceChild *
   }
 }
 
-void WrappedID3D11Device::Apply_InitialState(ID3D11DeviceChild *live,
-                                             const D3D11InitialContents &initial)
+void WrappedID3D11Device::Apply_InitialState(ID3D11DeviceChild *live, D3D11InitialContents &initial)
 {
   if(HasFatalError())
     return;
diff --git a/renderdoc/driver/d3d11/d3d11_manager.cpp b/renderdoc/driver/d3d11/d3d11_manager.cpp
index 61010dfcc..0dc35dc86 100644
--- a/renderdoc/driver/d3d11/d3d11_manager.cpp
+++ b/renderdoc/driver/d3d11/d3d11_manager.cpp
@@ -96,8 +96,7 @@ void D3D11ResourceManager::Create_InitialState(ResourceId id, ID3D11DeviceChild
   m_Device->Create_InitialState(id, live, hasData);
 }
 
-void D3D11ResourceManager::Apply_InitialState(ID3D11DeviceChild *live,
-                                              const D3D11InitialContents &data)
+void D3D11ResourceManager::Apply_InitialState(ID3D11DeviceChild *live, D3D11InitialContents &data)
 {
   m_Device->Apply_InitialState(live, data);
 }
diff --git a/renderdoc/driver/d3d11/d3d11_manager.h b/renderdoc/driver/d3d11/d3d11_manager.h
index 3ef269310..d5ee14b76 100644
--- a/renderdoc/driver/d3d11/d3d11_manager.h
+++ b/renderdoc/driver/d3d11/d3d11_manager.h
@@ -322,7 +322,7 @@ private:
   bool Serialise_InitialState(WriteSerialiser &ser, ResourceId id, D3D11ResourceRecord *record,
                               const D3D11InitialContents *initial);
   void Create_InitialState(ResourceId id, ID3D11DeviceChild *live, bool hasData);
-  void Apply_InitialState(ID3D11DeviceChild *live, const D3D11InitialContents &data);
+  void Apply_InitialState(ID3D11DeviceChild *live, D3D11InitialContents &data);
 
   WrappedID3D11Device *m_Device;
 };
diff --git a/renderdoc/driver/d3d12/d3d12_initstate.cpp b/renderdoc/driver/d3d12/d3d12_initstate.cpp
index bff7576ba..61b71eff4 100644
--- a/renderdoc/driver/d3d12/d3d12_initstate.cpp
+++ b/renderdoc/driver/d3d12/d3d12_initstate.cpp
@@ -1634,8 +1634,7 @@ void D3D12ResourceManager::Create_InitialState(ResourceId id, ID3D12DeviceChild
   }
 }
 
-void D3D12ResourceManager::Apply_InitialState(ID3D12DeviceChild *live,
-                                              const D3D12InitialContents &data)
+void D3D12ResourceManager::Apply_InitialState(ID3D12DeviceChild *live, D3D12InitialContents &data)
 {
   if(m_Device->HasFatalError())
     return;
diff --git a/renderdoc/driver/d3d12/d3d12_manager.h b/renderdoc/driver/d3d12/d3d12_manager.h
index 90206f716..fc7c7dd5c 100644
--- a/renderdoc/driver/d3d12/d3d12_manager.h
+++ b/renderdoc/driver/d3d12/d3d12_manager.h
@@ -1309,7 +1309,7 @@ private:
     return Serialise_InitialState<WriteSerialiser>(ser, id, record, initial);
   }
   void Create_InitialState(ResourceId id, ID3D12DeviceChild *live, bool hasData);
-  void Apply_InitialState(ID3D12DeviceChild *live, const D3D12InitialContents &data);
+  void Apply_InitialState(ID3D12DeviceChild *live, D3D12InitialContents &data);
   rdcarray<ResourceId> InitialContentResources();
 
   WrappedID3D12Device *m_Device;
diff --git a/renderdoc/driver/gl/gl_initstate.cpp b/renderdoc/driver/gl/gl_initstate.cpp
index a82eab003..ec075f31e 100644
--- a/renderdoc/driver/gl/gl_initstate.cpp
+++ b/renderdoc/driver/gl/gl_initstate.cpp
@@ -1920,7 +1920,7 @@ void GLResourceManager::Create_InitialState(ResourceId id, GLResource live, bool
   }
 }
 
-void GLResourceManager::Apply_InitialState(GLResource live, const GLInitialContents &initial)
+void GLResourceManager::Apply_InitialState(GLResource live, GLInitialContents &initial)
 {
   if(live.Namespace == eResBuffer)
   {
diff --git a/renderdoc/driver/gl/gl_manager.h b/renderdoc/driver/gl/gl_manager.h
index 347a0baa8..1b722f0a1 100644
--- a/renderdoc/driver/gl/gl_manager.h
+++ b/renderdoc/driver/gl/gl_manager.h
@@ -333,7 +333,7 @@ private:
   void PrepareTextureInitialContents(ResourceId liveid, ResourceId origid, GLResource res);
 
   void Create_InitialState(ResourceId id, GLResource live, bool hasData);
-  void Apply_InitialState(GLResource live, const GLInitialContents &initial);
+  void Apply_InitialState(GLResource live, GLInitialContents &initial);
 
   void MarkFBOAttachmentsReferenced(ResourceId id, GLResourceRecord *record, FrameRefType ref,
                                     bool markDirty);
diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h
index 83d6b3332..7c37efbb7 100644
--- a/renderdoc/driver/vulkan/vk_core.h
+++ b/renderdoc/driver/vulkan/vk_core.h
@@ -1220,7 +1220,7 @@ public:
   bool Serialise_InitialState(SerialiserType &ser, ResourceId id, VkResourceRecord *record,
                               const VkInitialContents *initial);
   void Create_InitialState(ResourceId id, WrappedVkRes *live, bool hasData);
-  void Apply_InitialState(WrappedVkRes *live, const VkInitialContents &initial);
+  void Apply_InitialState(WrappedVkRes *live, VkInitialContents &initial);
 
   void RemapQueueFamilyIndices(uint32_t &srcQueueFamily, uint32_t &dstQueueFamily);
   uint32_t GetQueueFamilyIndex() const { return m_QueueFamilyIdx; }
diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp
index 3c32565db..9cad65df5 100644
--- a/renderdoc/driver/vulkan/vk_initstate.cpp
+++ b/renderdoc/driver/vulkan/vk_initstate.cpp
@@ -1777,7 +1777,7 @@ void WrappedVulkan::Create_InitialState(ResourceId id, WrappedVkRes *live, bool)
   }
 }
 
-void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, const VkInitialContents &initial)
+void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, VkInitialContents &initial)
 {
   if(HasFatalError())
     return;
diff --git a/renderdoc/driver/vulkan/vk_manager.cpp b/renderdoc/driver/vulkan/vk_manager.cpp
index cf0791125..aecac6f55 100644
--- a/renderdoc/driver/vulkan/vk_manager.cpp
+++ b/renderdoc/driver/vulkan/vk_manager.cpp
@@ -1028,7 +1028,7 @@ void VulkanResourceManager::Create_InitialState(ResourceId id, WrappedVkRes *liv
   return m_Core->Create_InitialState(id, live, hasData);
 }
 
-void VulkanResourceManager::Apply_InitialState(WrappedVkRes *live, const VkInitialContents &initial)
+void VulkanResourceManager::Apply_InitialState(WrappedVkRes *live, VkInitialContents &initial)
 {
   return m_Core->Apply_InitialState(live, initial);
 }
diff --git a/renderdoc/driver/vulkan/vk_manager.h b/renderdoc/driver/vulkan/vk_manager.h
index 00b1e4537..665238dc0 100644
--- a/renderdoc/driver/vulkan/vk_manager.h
+++ b/renderdoc/driver/vulkan/vk_manager.h
@@ -508,7 +508,7 @@ private:
   bool Serialise_InitialState(WriteSerialiser &ser, ResourceId id, VkResourceRecord *record,
                               const VkInitialContents *initial);
   void Create_InitialState(ResourceId id, WrappedVkRes *live, bool hasData);
-  void Apply_InitialState(WrappedVkRes *live, const VkInitialContents &initial);
+  void Apply_InitialState(WrappedVkRes *live, VkInitialContents &initial);
   rdcarray<ResourceId> InitialContentResources();
 
   // dummy handle to use - starting from near highest valid pointer to minimise risk of overlap with real handles