diff --git a/src/backend/kms/mod.rs b/src/backend/kms/mod.rs
index 6c0a8ca5..23f8cc29 100644
--- a/src/backend/kms/mod.rs
+++ b/src/backend/kms/mod.rs
@@ -963,7 +963,7 @@ impl Surface {
                 };
                 state.send_frames(&self.output, &states);
                 surface
-                    .queue_buffer(feedback)
+                    .queue_buffer(damage, feedback)
                     .with_context(|| "Failed to submit buffer for display")?;
             }
             Err(err) => {
diff --git a/src/shell/element/mod.rs b/src/shell/element/mod.rs
index ef139e1d..42352d66 100644
--- a/src/shell/element/mod.rs
+++ b/src/shell/element/mod.rs
@@ -762,10 +762,7 @@ impl RenderElement<GlowRenderer> for CosmicMappedRenderElement<GlowRenderer> {
         }
     }
 
-    fn underlying_storage(
-        &self,
-        renderer: &GlowRenderer,
-    ) -> Option<UnderlyingStorage<'_, GlowRenderer>> {
+    fn underlying_storage(&self, renderer: &mut GlowRenderer) -> Option<UnderlyingStorage> {
         match self {
             CosmicMappedRenderElement::Stack(elem) => elem.underlying_storage(renderer),
             CosmicMappedRenderElement::Window(elem) => elem.underlying_storage(renderer),
@@ -800,8 +797,8 @@ impl<'a, 'b> RenderElement<GlMultiRenderer<'a, 'b>>
 
     fn underlying_storage(
         &self,
-        renderer: &GlMultiRenderer<'a, 'b>,
-    ) -> Option<UnderlyingStorage<'_, GlMultiRenderer<'a, 'b>>> {
+        renderer: &mut GlMultiRenderer<'a, 'b>,
+    ) -> Option<UnderlyingStorage> {
         match self {
             CosmicMappedRenderElement::Stack(elem) => elem.underlying_storage(renderer),
             CosmicMappedRenderElement::Window(elem) => elem.underlying_storage(renderer),
diff --git a/src/shell/workspace.rs b/src/shell/workspace.rs
index 91e84972..0bd43f36 100644
--- a/src/shell/workspace.rs
+++ b/src/shell/workspace.rs
@@ -721,8 +721,8 @@ where
 
     fn underlying_storage(
         &self,
-        renderer: &R,
-    ) -> Option<smithay::backend::renderer::element::UnderlyingStorage<'_, R>> {
+        renderer: &mut R,
+    ) -> Option<smithay::backend::renderer::element::UnderlyingStorage> {
         match self {
             WorkspaceRenderElement::Wayland(elem) => elem.underlying_storage(renderer),
             WorkspaceRenderElement::Window(elem) => elem.underlying_storage(renderer),