diff --git a/compositor/meson.build b/compositor/meson.build
index e8453310..df96dd6d 100644
--- a/compositor/meson.build
+++ b/compositor/meson.build
@@ -3,6 +3,7 @@
 glib_dep = [dependency('gio-2.0'), dependency('gio-unix-2.0'), dependency('gmodule-2.0')]
 gtk_dep = [dependency('gtk+-3.0'), dependency('gdk-x11-3.0')]
 gee_dep = dependency('gee-0.8')
+gnome_desktop_dep = dependency('gnome-desktop-3.0')
 m_dep = meson.get_compiler('c').find_library('m', required: false)
 posix_dep = meson.get_compiler('vala').find_library('posix', required: false)
 
diff --git a/src/Cards/ManualCard.vala b/src/Cards/ManualCard.vala
index cae3c34a..202c67ce 100644
--- a/src/Cards/ManualCard.vala
+++ b/src/Cards/ManualCard.vala
@@ -11,8 +11,6 @@ public class Greeter.ManualCard : Greeter.BaseCard {
     private Gtk.Box main_box;
 
     construct {
-        width_request = 350;
-
         var icon = new Gtk.Image () {
             icon_name = "avatar-default",
             pixel_size = 64
diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala
index f67b7361..215fa7da 100644
--- a/src/Cards/UserCard.vala
+++ b/src/Cards/UserCard.vala
@@ -276,7 +276,7 @@ public class Greeter.UserCard : Greeter.BaseCard {
         if (user_is_logged_in) {
             avatar_overlay.add_overlay (logged_in);
             logged_in.show_all ();
-        } else {
+        } else if (logged_in.parent == avatar_overlay) {
             avatar_overlay.remove (logged_in);
         }
     }
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 783f0282..1733f52a 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -157,7 +157,7 @@ public class Greeter.MainWindow : Gtk.ApplicationWindow {
                 return Gdk.EVENT_PROPAGATE;
             }
 
-            unowned var focused_entry = (Gtk.Entry) get_focus ();
+            unowned var focused_entry = get_focus () as Gtk.Entry;
             if (focused_entry == null || !focused_entry.is_ancestor (current_card) || focused_entry.text != "") {
                 return Gdk.EVENT_PROPAGATE;
             }
diff --git a/src/meson.build b/src/meson.build
index 50c87f9d..b0d3d696 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,7 +3,6 @@ gobject_dep = dependency('gobject-2.0')
 glib_dep = dependency('glib-2.0')
 gdk_wl_dep = dependency('gdk-wayland-3.0')
 gdk_x11_dep = dependency('gdk-x11-3.0')
-gnome_desktop_dep = dependency('gnome-desktop-3.0')
 gtk_dep = dependency('gtk+-3.0')
 granite_dep = dependency('granite', version: '>= 5.5.0')
 hdy_dep = dependency('libhandy-1', version: '>= 1.1.90')