diff --git a/build-win32.txt b/build-win32.txt
index 01f236a6..3423298c 100644
--- a/build-win32.txt
+++ b/build-win32.txt
@@ -6,10 +6,10 @@ strip = '/usr/bin/i686-w64-mingw32-strip'
 exe_wrapper = 'wine'
 
 [properties]
-c_args = ['-Og', '-gstabs']
+c_args = ['-Og', '-gdwarf-2']
 c_link_args = ['-static', '-static-libgcc']
 
-cpp_args = ['-Og', '-gstabs']
+cpp_args = ['-Og', '-gdwarf-2']
 cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++', '-Wl,--add-stdcall-alias']
 
 [host_machine]
diff --git a/build-win64.txt b/build-win64.txt
index 7a08c38a..ac19898a 100644
--- a/build-win64.txt
+++ b/build-win64.txt
@@ -6,10 +6,10 @@ strip = '/usr/bin/x86_64-w64-mingw32-strip'
 exe_wrapper = 'wine'
 
 [properties]
-c_args = ['-Og', '-gstabs']
+c_args = ['-Og', '-gdwarf-2']
 c_link_args = ['-static', '-static-libgcc']
 
-cpp_args = ['-Og', '-gstabs']
+cpp_args = ['-Og', '-gdwarf-2']
 cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']
 
 [host_machine]
diff --git a/src/dxvk/dxvk_unbound.cpp b/src/dxvk/dxvk_unbound.cpp
index 5baa1dd3..818dd7ef 100644
--- a/src/dxvk/dxvk_unbound.cpp
+++ b/src/dxvk/dxvk_unbound.cpp
@@ -3,7 +3,8 @@
 namespace dxvk {
   
   DxvkUnboundResources::DxvkUnboundResources(DxvkDevice* dev)
-  : m_buffer        (createBuffer(dev)),
+  : m_sampler       (createSampler(dev)),
+    m_buffer        (createBuffer(dev)),
     m_bufferView    (createBufferView(dev, m_buffer)),
     m_image1D       (createImage(dev, VK_IMAGE_TYPE_1D, 1)),
     m_image2D       (createImage(dev, VK_IMAGE_TYPE_2D, 6)),
@@ -142,7 +143,7 @@ namespace dxvk {
       case VK_IMAGE_VIEW_TYPE_CUBE:       return m_viewCube.ptr();
       case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY: return m_viewCubeArr.ptr();
       case VK_IMAGE_VIEW_TYPE_3D:         return m_view3D.ptr();
-      default:                            return nullptr;
+      default:                            Logger::err("null"); return nullptr;
     }
   }