diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c
index 37c364f3e8..fcb16090fe 100644
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -151,7 +151,7 @@ query_for_toplevel (GdkScreen  *screen,
 
   g_object_unref (cursor);
   gtk_widget_destroy (popup);
-  gdk_flush ();                 /* Really release the grab */
+  gdk_display_flush (display);                 /* Really release the grab */
 
   return toplevel;
 }
diff --git a/modules/input/gtkimcontextthai.c b/modules/input/gtkimcontextthai.c
index 73510c0360..c3ebc83be5 100644
--- a/modules/input/gtkimcontextthai.c
+++ b/modules/input/gtkimcontextthai.c
@@ -336,7 +336,8 @@ gtk_im_context_thai_filter_keypress (GtkIMContext *context,
   if (is_reject)
     {
       /* reject character */
-      gdk_beep ();
+      GdkDisplay *display = gdk_display_get_default ();
+      gdk_display_beep (display);
     }
   return TRUE;
 }
diff --git a/tests/animated-resizing.c b/tests/animated-resizing.c
index 8660089276..d11d6e0dee 100644
--- a/tests/animated-resizing.c
+++ b/tests/animated-resizing.c
@@ -168,7 +168,7 @@ int
 main(int argc, char **argv)
 {
   GError *error = NULL;
-  GdkScreen *screen;
+  GdkMonitor *monitor;
   GdkRectangle monitor_bounds;
 
   GOptionContext *context = g_option_context_new (NULL);
@@ -204,10 +204,8 @@ main(int argc, char **argv)
                     G_CALLBACK (on_map_event), NULL);
   on_frame (0.);
 
-  screen = gtk_widget_get_screen (window);
-  gdk_screen_get_monitor_geometry (screen,
-                                   gdk_screen_get_primary_monitor (screen),
-                                   &monitor_bounds);
+  monitor = gdk_display_get_primary_monitor (gtk_widget_get_display (window));
+  gdk_monitor_get_geometry (monitor, &monitor_bounds);
 
   gtk_window_move (GTK_WINDOW (window),
                    monitor_bounds.x + (monitor_bounds.width - window_width) / 2,