diff --git a/src/main.c b/src/main.c
index 2793e7e61..571f1c472 100644
--- a/src/main.c
+++ b/src/main.c
@@ -158,7 +158,7 @@ main (int argc, char **argv)
   /* gtk_init() below overrides this, so it can be removed */
   meta_errors_init ();
   
-  g_type_init (0); /* grumble */
+  g_type_init ();
 
   if (!disable_sm)
     meta_session_init (client_id); /* client_id == NULL is fine */
diff --git a/src/ui.c b/src/ui.c
index ff8d312b4..c9c66b510 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -160,7 +160,7 @@ meta_ui_map_frame   (MetaUI *ui,
   window = gdk_xid_table_lookup (xwindow);
 
   if (window)
-    gdk_x11_window_map (window);
+    gdk_window_show_unraised (window);
 }
 
 void