diff --git a/gdk/gdkcontentformats.c b/gdk/gdkcontentformats.c
index cb2528fbee..9ca4db3205 100644
--- a/gdk/gdkcontentformats.c
+++ b/gdk/gdkcontentformats.c
@@ -645,6 +645,9 @@ gdk_content_formats_builder_clear (GdkContentFormatsBuilder *builder)
 {
   g_clear_pointer (&builder->gtypes, g_slist_free);
   g_clear_pointer (&builder->mime_types, g_slist_free);
+
+  builder->n_gtypes = 0;
+  builder->n_mime_types = 0;
 }
 
 /**
diff --git a/gtk.supp b/gtk.supp
index b6b315c823..3bdfc02829 100644
--- a/gtk.supp
+++ b/gtk.supp
@@ -14,7 +14,7 @@
    GIO modules
    Memcheck:Leak
    match-leak-kinds: definite
-   fun:malloc
+   fun:calloc
    ...
    fun:_g_io_module_get_default
 }
@@ -23,9 +23,9 @@
    GTK media extension gio modules
    Memcheck:Leak
    match-leak-kinds: definite
-   fun:malloc
+   fun:calloc
    ...
-   fun:gio_module_new
+   fun:g_io_module_new
    ...
    fun:gtk_media_file_extension_init
 }
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index cac6de6856..9f9f5615b8 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -70,7 +70,7 @@ typedef enum
   GTK_ALIGN_END,
   GTK_ALIGN_CENTER,
   GTK_ALIGN_BASELINE_FILL GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GTK_ALIGN_BASELINE GDK_DEPRECATED_ENUMERATOR_IN_4_12_FOR(GTK_ALIGN_BASELINE_FILL) = GTK_ALIGN_BASELINE_FILL,
+  GTK_ALIGN_BASELINE GDK_DEPRECATED_ENUMERATOR_IN_4_12_FOR(GTK_ALIGN_BASELINE_FILL) = GTK_ALIGN_CENTER + 1,
   GTK_ALIGN_BASELINE_CENTER GDK_AVAILABLE_ENUMERATOR_IN_4_12,
 } GtkAlign;
 
diff --git a/gtk/print/gtkprintunixdialog.c b/gtk/print/gtkprintunixdialog.c
index 36639a3097..f39a361a1a 100644
--- a/gtk/print/gtkprintunixdialog.c
+++ b/gtk/print/gtkprintunixdialog.c
@@ -2583,8 +2583,7 @@ draw_page (GtkDrawingArea *da,
 
   g_object_unref (layout);
 
-  style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
-  color = *gtk_css_color_value_get_rgba (style->core->color);
+  gtk_widget_get_color (widget, &color);
 
   if (page_setup != NULL)
     {