diff --git a/src/wayland/shell/xdg/xdg_handlers.rs b/src/wayland/shell/xdg/xdg_handlers.rs
index 4264509..d5dc724 100644
--- a/src/wayland/shell/xdg/xdg_handlers.rs
+++ b/src/wayland/shell/xdg/xdg_handlers.rs
@@ -533,7 +533,6 @@ where
         // the wl_surface is destroyed, this means the client is not
         // trying to change the role but it's a cleanup (possibly a
         // disconnecting client), ignore the protocol check.
-        return;
     } else {
         data.shell_data
             .compositor_token
@@ -622,7 +621,6 @@ where
         // the wl_surface is destroyed, this means the client is not
         // trying to change the role but it's a cleanup (possibly a
         // disconnecting client), ignore the protocol check.
-        return;
     } else {
         data.shell_data
             .compositor_token
diff --git a/src/wayland/shell/xdg/zxdgv6_handlers.rs b/src/wayland/shell/xdg/zxdgv6_handlers.rs
index 5bf5f62..1621146 100644
--- a/src/wayland/shell/xdg/zxdgv6_handlers.rs
+++ b/src/wayland/shell/xdg/zxdgv6_handlers.rs
@@ -547,7 +547,6 @@ where
         // the wl_surface is destroyed, this means the client is not
         // trying to change the role but it's a cleanup (possibly a
         // disconnecting client), ignore the protocol check.
-        return;
     } else {
         data.shell_data
             .compositor_token
@@ -639,7 +638,6 @@ where
         // the wl_surface is destroyed, this means the client is not
         // trying to change the role but it's a cleanup (possibly a
         // disconnecting client), ignore the protocol check.
-        return;
     } else {
         data.shell_data
             .compositor_token
diff --git a/vagga.yaml b/vagga.yaml
index 4505ce0..e423206 100644
--- a/vagga.yaml
+++ b/vagga.yaml
@@ -4,7 +4,7 @@ containers:
     base:
         auto-clean: true
         setup:
-            - !UbuntuRelease { codename: artful }
+            - !UbuntuRelease { codename: cosmic }
             - !UbuntuUniverse
             - !Install [build-essential, wget, curl, pkg-config, file, openssl, sudo, ca-certificates, libssl-dev, cmake, libudev-dev, libgbm-dev, libxkbcommon-dev, libegl1-mesa-dev, libwayland-dev, libinput-dev, libsystemd-dev, libdbus-1-dev]