diff --git a/renderdoc/api/replay/structured_data.h b/renderdoc/api/replay/structured_data.h
index d8930124e..d512229e1 100644
--- a/renderdoc/api/replay/structured_data.h
+++ b/renderdoc/api/replay/structured_data.h
@@ -352,7 +352,6 @@ DOCUMENT("Defines a single structured chunk, which is a :class:`SDObject`.");
 struct SDChunk : public SDObject
 {
   SDChunk(const char *name) : SDObject(name, "Chunk") { type.basetype = SDBasic::Chunk; }
-  ~SDChunk() { (void)metadata; };
   DOCUMENT("The :class:`SDChunkMetaData` with the metadata for this chunk.");
   SDChunkMetaData metadata;
 
diff --git a/renderdoc/driver/d3d11/d3d11_device_wrap.cpp b/renderdoc/driver/d3d11/d3d11_device_wrap.cpp
index f00a18fd2..b059a08db 100644
--- a/renderdoc/driver/d3d11/d3d11_device_wrap.cpp
+++ b/renderdoc/driver/d3d11/d3d11_device_wrap.cpp
@@ -254,7 +254,7 @@ std::vector<D3D11_SUBRESOURCE_DATA> WrappedID3D11Device::Serialise_CreateTexture
           record->DataInSerialiser = true;
 
         record->NumSubResources = numSubresources;
-        record->SubResources = new ResourceRecord *[record->NumSubResources];
+        record->SubResources = new D3D11ResourceRecord *[record->NumSubResources];
         for(UINT s = 0; s < numSubresources; s++)
         {
           record->SubResources[s] = new D3D11ResourceRecord(ResourceId());
diff --git a/renderdoc/driver/d3d11/d3d11_manager.h b/renderdoc/driver/d3d11/d3d11_manager.h
index 1e3e78607..8021898f9 100644
--- a/renderdoc/driver/d3d11/d3d11_manager.h
+++ b/renderdoc/driver/d3d11/d3d11_manager.h
@@ -157,7 +157,7 @@ struct D3D11ResourceRecord : public ResourceRecord
   bool ignoreSerialise;
 
   int NumSubResources;
-  ResourceRecord **SubResources;
+  D3D11ResourceRecord **SubResources;
 
 private:
   byte *ShadowPtr[32][2];