diff --git a/gsk/gl/gskglcommandqueue.c b/gsk/gl/gskglcommandqueue.c
index 640b87bf12..8a1f9c84b0 100644
--- a/gsk/gl/gskglcommandqueue.c
+++ b/gsk/gl/gskglcommandqueue.c
@@ -956,7 +956,7 @@ gsk_gl_command_queue_execute (GskGLCommandQueue    *self,
                               guint                 default_framebuffer)
 {
   G_GNUC_UNUSED guint count = 0;
-  graphene_rect_t scissor_test = { 0, };
+  graphene_rect_t scissor_test = GRAPHENE_RECT_INIT (0, 0, 0, 0);
   gboolean has_scissor = scissor != NULL;
   gboolean scissor_state = -1;
   guint program = 0;
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 2a756e49d4..15910f47e5 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -2415,7 +2415,6 @@ _gtk_text_btree_get_text (const GtkTextIter *start_orig,
   GtkTextLineSegment *seg;
   GtkTextLineSegment *end_seg;
   GString *retval;
-  char *str;
   GtkTextIter iter;
   GtkTextIter start;
   GtkTextIter end;
@@ -2447,9 +2446,7 @@ _gtk_text_btree_get_text (const GtkTextIter *start_orig,
 
   copy_segment (retval, include_hidden, include_nonchars, &iter, &end);
 
-  str = retval->str;
-  g_string_free (retval, FALSE);
-  return str;
+  return g_string_free (retval, FALSE);
 }
 
 int