diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index d603dd793..46b9cbe10 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -32,9 +32,10 @@ namespace dxvk {
       DxvkContextFlag::GpDirtyPipelineState,
       DxvkContextFlag::GpDirtyDynamicState,
       DxvkContextFlag::GpDirtyResources,
-      DxvkContextFlag::GpDirtyIndexBuffer,
       DxvkContextFlag::GpDirtyVertexBuffers,
+      DxvkContextFlag::GpDirtyIndexBuffer,
       DxvkContextFlag::CpDirtyPipeline,
+      DxvkContextFlag::CpDirtyPipelineState,
       DxvkContextFlag::CpDirtyResources);
   }
   
diff --git a/src/dxvk/dxvk_framebuffer.h b/src/dxvk/dxvk_framebuffer.h
index 328dff2ec..4701cb305 100644
--- a/src/dxvk/dxvk_framebuffer.h
+++ b/src/dxvk/dxvk_framebuffer.h
@@ -173,9 +173,11 @@ namespace dxvk {
     
     Rc<vk::DeviceFn>    m_vkd;
     Rc<DxvkRenderPass>  m_renderPass;
+    
     DxvkRenderTargets   m_renderTargets;
-    DxvkFramebufferSize m_framebufferSize;
-    VkFramebuffer       m_framebuffer;
+    DxvkFramebufferSize m_framebufferSize = { 0, 0, 0 };
+    
+    VkFramebuffer       m_framebuffer     = VK_NULL_HANDLE;
     
   };