diff --git a/renderdoc/driver/d3d11/d3d11_device.h b/renderdoc/driver/d3d11/d3d11_device.h
index 4fa4a1634..44a45f9e7 100644
--- a/renderdoc/driver/d3d11/d3d11_device.h
+++ b/renderdoc/driver/d3d11/d3d11_device.h
@@ -469,7 +469,7 @@ public:
   {
     if(iid == __uuidof(ID3D11Device) || iid == __uuidof(ID3D11Device1) ||
        iid == __uuidof(ID3D11Device2) || iid == __uuidof(ID3D11Device3) ||
-       iid == __uuidof(ID3D11Device4))
+       iid == __uuidof(ID3D11Device4) || iid == __uuidof(ID3D11Device5))
       return true;
 
     return false;
@@ -486,6 +486,8 @@ public:
       return (ID3D11Device3 *)this;
     else if(iid == __uuidof(ID3D11Device4))
       return (ID3D11Device4 *)this;
+    else if(iid == __uuidof(ID3D11Device5))
+      return (ID3D11Device5 *)this;
 
     RDCERR("Requested unknown device interface %s", ToStr(iid).c_str());
 
@@ -873,4 +875,4 @@ public:
                                                 REFIID riid, void **ppFence);
 
   virtual HRESULT STDMETHODCALLTYPE OpenSharedFence(HANDLE hFence, REFIID riid, void **ppFence);
-};
\ No newline at end of file
+};
diff --git a/renderdoc/driver/d3d11/d3d11_resources.h b/renderdoc/driver/d3d11/d3d11_resources.h
index 4117c729a..8456585cd 100644
--- a/renderdoc/driver/d3d11/d3d11_resources.h
+++ b/renderdoc/driver/d3d11/d3d11_resources.h
@@ -193,7 +193,7 @@ public:
        riid == __uuidof(IDXGIResource1) || riid == __uuidof(IDXGISurface2))
     {
       // ensure the real object has this interface
-      void *outObj;
+      void *outObj = NULL;
       HRESULT hr = m_pReal->QueryInterface(riid, &outObj);
 
       IUnknown *unk = (IUnknown *)outObj;
@@ -1495,4 +1495,4 @@ template <>
 inline ResourceId GetIDForResource(ID3D11View *v)
 {
   return GetIDForDeviceChild(v);
-}
\ No newline at end of file
+}
diff --git a/renderdoc/driver/dxgi/dxgi_wrapped.h b/renderdoc/driver/dxgi/dxgi_wrapped.h
index 8d43f70f6..d497faf55 100644
--- a/renderdoc/driver/dxgi/dxgi_wrapped.h
+++ b/renderdoc/driver/dxgi/dxgi_wrapped.h
@@ -228,7 +228,7 @@ public:
   HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject)
   {
     // ensure the real object has this interface
-    void *outObj;
+    void *outObj = NULL;
     HRESULT hr = m_pWrapped->QueryInterface(riid, &outObj);
 
     IUnknown *unk = (IUnknown *)outObj;