diff --git a/src/d3d11/d3d11_context.cpp b/src/d3d11/d3d11_context.cpp
index 6f1e8488..d1d04160 100644
--- a/src/d3d11/d3d11_context.cpp
+++ b/src/d3d11/d3d11_context.cpp
@@ -488,18 +488,39 @@ namespace dxvk {
         srcBuffer.offset(),
         srcBuffer.length());
     } else {
-      Logger::err("D3D11DeviceContext::CopyResource: Images not supported");
+      const D3D11TextureInfo* dstTextureInfo = GetCommonTextureInfo(pDstResource);
+      const D3D11TextureInfo* srcTextureInfo = GetCommonTextureInfo(pSrcResource);
+
+      const DxvkFormatInfo* dstFormatInfo = imageFormatInfo(dstTextureInfo->image->info().format);
+      const DxvkFormatInfo* srcFormatInfo = imageFormatInfo(srcTextureInfo->image->info().format);
+
+      for (uint32_t i = 0; i < srcTextureInfo->image->info().mipLevels; i++) {
+        VkExtent3D extent = srcTextureInfo->image->mipLevelExtent(i);
+
+        const VkImageSubresourceLayers dstLayers = {
+          dstFormatInfo->aspectMask & srcFormatInfo->aspectMask,
+          i, 0, dstTextureInfo->image->info().numLayers };
+
+        const VkImageSubresourceLayers srcLayers = {
+          dstFormatInfo->aspectMask & srcFormatInfo->aspectMask,
+          i, 0, srcTextureInfo->image->info().numLayers };
+
+        m_context->copyImage(
+          dstTextureInfo->image, dstLayers, VkOffset3D { 0, 0, 0 },
+          srcTextureInfo->image, srcLayers, VkOffset3D { 0, 0, 0 },
+          extent);
+      }
     }
   }
-  
-  
+
+
   void STDMETHODCALLTYPE D3D11DeviceContext::CopyStructureCount(
           ID3D11Buffer*                     pDstBuffer,
           UINT                              DstAlignedByteOffset,
           ID3D11UnorderedAccessView*        pSrcView) {
     auto buf = static_cast<D3D11Buffer*>(pDstBuffer);
     auto uav = static_cast<D3D11UnorderedAccessView*>(pSrcView);
-    
+
     const DxvkBufferSlice dstSlice = buf->GetBufferSlice(DstAlignedByteOffset);
     const DxvkBufferSlice srcSlice = uav->GetCounterSlice();
     
diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp
index f1a36d6d..38ffbc31 100644
--- a/src/d3d11/d3d11_device.cpp
+++ b/src/d3d11/d3d11_device.cpp
@@ -1063,16 +1063,9 @@ namespace dxvk {
   HRESULT STDMETHODCALLTYPE D3D11Device::CreateQuery(
     const D3D11_QUERY_DESC*           pQueryDesc,
           ID3D11Query**               ppQuery) {
-    // Other query types are currently unsupported
-    if (pQueryDesc->Query != D3D11_QUERY_OCCLUSION
-     && pQueryDesc->Query != D3D11_QUERY_OCCLUSION_PREDICATE) {
-      Logger::err(str::format("D3D11Device: Unsupported query type: ", pQueryDesc->Query));
-      return E_INVALIDARG;
-    }
-    
     if (ppQuery == nullptr)
       return S_FALSE;
-    
+
     try {
       *ppQuery = ref(new D3D11Query(this, *pQueryDesc));
       return S_OK;
diff --git a/src/d3d11/d3d11_query.cpp b/src/d3d11/d3d11_query.cpp
index 41139406..c7e53e7d 100644
--- a/src/d3d11/d3d11_query.cpp
+++ b/src/d3d11/d3d11_query.cpp
@@ -7,7 +7,15 @@ namespace dxvk {
           D3D11Device*      device,
     const D3D11_QUERY_DESC& desc)
   : m_device(device), m_desc(desc) {
-    Logger::warn("D3D11Query: Stub");
+    switch (desc.Query) {
+      // Other query types are currently unsupported
+      case D3D11_QUERY_OCCLUSION:
+      case D3D11_QUERY_OCCLUSION_PREDICATE:
+        break;
+
+      default:
+        Logger::warn(str::format("D3D11Query: Unsupported query type ", desc.Query));
+    }
   }