diff --git a/app/src/main/cpp/skyline/common/dirty_tracking.h b/app/src/main/cpp/skyline/common/dirty_tracking.h
index e241eedc..3bfaf29e 100644
--- a/app/src/main/cpp/skyline/common/dirty_tracking.h
+++ b/app/src/main/cpp/skyline/common/dirty_tracking.h
@@ -33,7 +33,7 @@ namespace skyline::dirty {
      * @tparam OverlapPoolSize Size of the pool used to store handles when there are multiple bound to the same subresource
      * @note This class is *NOT* thread-safe
      */
-    template<size_t ManagedResourceSize, size_t Granularity, size_t OverlapPoolSize = 0x400>
+    template<size_t ManagedResourceSize, size_t Granularity, size_t OverlapPoolSize = 0x1000>
     class Manager {
       private:
         struct BindingState {
diff --git a/app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_state.cpp b/app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_state.cpp
index 372aeca4..737a2728 100644
--- a/app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_state.cpp
+++ b/app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_state.cpp
@@ -399,9 +399,16 @@ namespace skyline::gpu::interconnect::maxwell3d {
     void PipelineState::EngineRegisters::DirtyBind(DirtyManager &manager, dirty::Handle handle) const {
         auto bindFunc{[&](auto &regs) { regs.DirtyBind(manager, handle); }};
 
+        ranges::for_each(pipelineStageRegisters, bindFunc);
         ranges::for_each(colorRenderTargetsRegisters, bindFunc);
         bindFunc(depthRenderTargetRegisters);
         bindFunc(vertexInputRegisters);
+        bindFunc(inputAssemblyRegisters);
+        bindFunc(tessellationRegisters);
+        bindFunc(rasterizationRegisters);
+        bindFunc(depthStencilRegisters);
+        bindFunc(colorBlendRegisters);
+        bindFunc(globalShaderConfigRegisters);
     }
 
     PipelineState::PipelineState(dirty::Handle dirtyHandle, DirtyManager &manager, const EngineRegisters &engine)