diff --git a/src/main.c b/src/main.c
index 9663457c7350bfdaa217d86ca9f3137e78cdbcb1..a182f940907826ee0de7e04275fcd5f80423f934 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,6 +18,8 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 
+#include <locale.h>
+
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/headless.h>
diff --git a/src/output.c b/src/output.c
index 96331e53cb97d327cd3642c8a7aa43d1c72555a0..6daa5aca47767aa9ff4447a90fe79222f2f3e5fc 100644
--- a/src/output.c
+++ b/src/output.c
@@ -908,9 +908,9 @@ phoc_output_initable_init (GInitable    *initable,
     if (priv->cutouts) {
       g_message ("Adding cutouts overlay");
       priv->cutouts_texture = phoc_cutouts_overlay_get_cutouts_texture (priv->cutouts, self);
-      priv->render_cutouts_id =  g_signal_connect_swapped (renderer, "render-end",
-                                                           G_CALLBACK (render_cutouts),
-                                                           self);
+      priv->render_cutouts_id = g_signal_connect_swapped (renderer, "render-end",
+                                                          G_CALLBACK (render_cutouts),
+                                                          self);
     } else {
       g_warning ("Could not create cutout overlay");
     }
@@ -944,10 +944,10 @@ phoc_output_finalize (GObject *object)
 
   wl_list_init (&self->layer_surfaces);
 
+  g_clear_signal_handler (&priv->render_cutouts_id, priv->renderer);
   g_clear_object (&priv->renderer);
   g_clear_object (&priv->cutouts);
   g_clear_pointer (&priv->cutouts_texture, wlr_texture_destroy);
-  g_clear_signal_handler (&priv->render_cutouts_id, self);
   g_clear_object (&priv->shield);
   g_clear_object (&self->desktop);