diff --git a/plugins/platforms/drm/egl_stream_backend.cpp b/plugins/platforms/drm/egl_stream_backend.cpp
index 65a502f7d4..67e0034a71 100644
--- a/plugins/platforms/drm/egl_stream_backend.cpp
+++ b/plugins/platforms/drm/egl_stream_backend.cpp
@@ -248,7 +248,7 @@ void EglStreamBackend::attachStreamConsumer(KWaylandServer::SurfaceInterface *su
         m_streamTextures.insert(surface, newSt);
         texture = newSt.texture;
 
-        connect(surface, &KWaylandServer::Resource::unbound, this,
+        connect(surface, &KWaylandServer::SurfaceInterface::destroyed, this,
             [surface, this]() {
                 const StreamTexture &st = m_streamTextures.take(surface);
                 pEglDestroyStreamKHR(eglDisplay(), st.stream);
diff --git a/wayland_server.cpp b/wayland_server.cpp
index c4334afe2c..9ec142cf16 100644
--- a/wayland_server.cpp
+++ b/wayland_server.cpp
@@ -305,7 +305,6 @@ bool WaylandServer::init(const QByteArray &socketName, InitializationFlags flags
         return false;
     }
     m_compositor = m_display->createCompositor(m_display);
-    m_compositor->create();
     connect(m_compositor, &CompositorInterface::surfaceCreated, this,
         [this] (SurfaceInterface *surface) {
             // check whether we have a Toplevel with the Surface's id
diff --git a/xdgshellclient.cpp b/xdgshellclient.cpp
index 744e9a1a8a..5e1ed2a90c 100644
--- a/xdgshellclient.cpp
+++ b/xdgshellclient.cpp
@@ -74,8 +74,6 @@ XdgSurfaceClient::XdgSurfaceClient(XdgSurfaceInterface *shellSurface)
     connect(shellSurface->surface(), &SurfaceInterface::mapped,
             this, &XdgSurfaceClient::setReadyForPainting);
 #endif
-    connect(shellSurface->surface(), &SurfaceInterface::unbound,
-            this, &XdgSurfaceClient::destroyClient);
     connect(shellSurface->surface(), &SurfaceInterface::destroyed,
             this, &XdgSurfaceClient::destroyClient);