diff --git a/renderdoc/driver/d3d11/d3d11_context.cpp b/renderdoc/driver/d3d11/d3d11_context.cpp
index 63cc198a0..f80907df6 100644
--- a/renderdoc/driver/d3d11/d3d11_context.cpp
+++ b/renderdoc/driver/d3d11/d3d11_context.cpp
@@ -60,7 +60,7 @@ HRESULT STDMETHODCALLTYPE WrappedID3DUserDefinedAnnotation::QueryInterface(REFII
 {
   if(riid == __uuidof(ID3DUserDefinedAnnotation))
   {
-    *ppvObject = (void *)(ID3DUserDefinedAnnotation *)this;
+    *ppvObject = (ID3DUserDefinedAnnotation *)this;
     AddRef();
     return S_OK;
   }
diff --git a/renderdoc/driver/d3d11/d3d11_device3_wrap.cpp b/renderdoc/driver/d3d11/d3d11_device3_wrap.cpp
index cab33eadf..647f3c6fc 100644
--- a/renderdoc/driver/d3d11/d3d11_device3_wrap.cpp
+++ b/renderdoc/driver/d3d11/d3d11_device3_wrap.cpp
@@ -1024,7 +1024,7 @@ HRESULT WrappedID3D11Device::CreateFence(UINT64 InitialValue, D3D11_FENCE_FLAG F
 
   WrappedID3D11Fence *wrapped = new WrappedID3D11Fence(ret, this);
 
-  *ppFence = (void *)wrapped;
+  *ppFence = (ID3D11Fence *)wrapped;
 
   return S_OK;
 }
@@ -1051,7 +1051,7 @@ HRESULT WrappedID3D11Device::OpenSharedFence(HANDLE hFence, REFIID riid, void **
 
   WrappedID3D11Fence *wrapped = new WrappedID3D11Fence(ret, this);
 
-  *ppFence = (void *)wrapped;
+  *ppFence = (ID3D11Fence *)wrapped;
 
   return S_OK;
 }
diff --git a/renderdoc/driver/d3d11/d3d11_resources.cpp b/renderdoc/driver/d3d11/d3d11_resources.cpp
index 6c0ce0a15..c71a8a81e 100644
--- a/renderdoc/driver/d3d11/d3d11_resources.cpp
+++ b/renderdoc/driver/d3d11/d3d11_resources.cpp
@@ -364,6 +364,8 @@ ResourceId GetIDForDeviceChild(ID3D11DeviceChild *ptr)
     return ((WrappedID3D11CommandList *)ptr)->GetResourceID();
   if(WrappedID3DDeviceContextState::IsAlloc(ptr))
     return ((WrappedID3DDeviceContextState *)ptr)->GetResourceID();
+  if(WrappedID3D11Fence::IsAlloc(ptr))
+    return ((WrappedID3D11Fence *)ptr)->GetResourceID();
 
   RDCERR("Unknown type for ptr 0x%p", ptr);