diff --git a/MobileGL/MG_Backend/DirectGLES/Utils.cpp b/MobileGL/MG_Backend/DirectGLES/Utils.cpp
index b169ba5e..351e6b11 100644
--- a/MobileGL/MG_Backend/DirectGLES/Utils.cpp
+++ b/MobileGL/MG_Backend/DirectGLES/Utils.cpp
@@ -52,6 +52,7 @@ namespace MobileGL::MG_Backend::DirectGLES {
         // apply thread (and these reads all run there), so its cache is the authoritative one.
         // Before the session lands, or under monolith transport in a disaggregated build, fall
         // back to the process global exactly as the monolith path always has.
+#if MOBILEGL_BUILD_DISAGGREGATED
         if (MG_Config::Transport != MG_Config::TransportMode::Monolith) {
             if (MG_Backend::BackendObject* server = MG_Remote::Server::ServerLoopInstance().Backend()) {
                 return &server->GetFormatCapabilities();
@@ -66,6 +67,7 @@ namespace MobileGL::MG_Backend::DirectGLES {
                     "on the apply thread");
             std::abort();
         }
+#endif
         return pActiveBackendObject ? &pActiveBackendObject->GetFormatCapabilities() : nullptr;
     }
 #endif
diff --git a/MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.cpp b/MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.cpp
index ce8b92a5..253cd7f5 100644
--- a/MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.cpp
+++ b/MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.cpp
@@ -431,7 +431,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
     }
 
     void BackendObject_DirectVulkan::Initialize() {
-#if MOBILEGL_BUILD_RECORD_ARM
+#if MOBILEGL_BUILD_DISAGGREGATED
         VkBufferManager::RegisterWireResourceOps();
         // P7 wave 2 package C (CONTRACT-P7 §5.5). BESIDE the resource ops and for the same
         // reason: this is the one place both Magma server roles pass through - the inproc
diff --git a/MobileGL/MG_Backend/DirectVulkan/DirectVulkan.cpp b/MobileGL/MG_Backend/DirectVulkan/DirectVulkan.cpp
index ea9acb96..45f298f3 100644
--- a/MobileGL/MG_Backend/DirectVulkan/DirectVulkan.cpp
+++ b/MobileGL/MG_Backend/DirectVulkan/DirectVulkan.cpp
@@ -68,7 +68,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
         SessionLocal<RendererGeneration> g_rendererGeneration;
     } // namespace
 
-#if MOBILEGL_BUILD_RECORD_ARM
+#if MOBILEGL_BUILD_DISAGGREGATED
     namespace {
         // P7 wave 2 package C, CONTRACT-P7 §5.5: MAGMA'S MIRROR OF g_glesStateObjectDeathOps
         // (DirectGLES/Managers.cpp:335), and the one arm of that table Magma has any work in.
@@ -126,7 +126,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
     Bool StateObjectDeathOpsInstalled() {
         return MG_State::GLState::GetStateObjectDeathOps() == &g_magmaStateObjectDeathOps;
     }
-#endif // MOBILEGL_BUILD_RECORD_ARM && MOBILEGL_PIPE_PUSH
+#endif // MOBILEGL_BUILD_DISAGGREGATED
 
     Uint64 GetRendererGeneration() {
         return g_rendererGeneration->value.load(std::memory_order_acquire);