diff --git a/src/eggsmclient.c b/src/eggsmclient.c
index 79064e4..d09c668 100644
--- a/src/eggsmclient.c
+++ b/src/eggsmclient.c
@@ -188,6 +188,9 @@ sm_client_post_parse_func (GOptionContext  *context,
 {
   EggSMClient *client = egg_sm_client_get ();
 
+  fprintf (stderr, "sm_client_post_parse_func\n");
+  return TRUE;
+
   if (sm_client_id == NULL)
     {
       const gchar *desktop_autostart_id;
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index acfd5d8..90c60b2 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1384,15 +1384,19 @@ get_child_environment (TerminalScreen *screen,
   g_hash_table_replace (env_table, g_strdup ("COLORTERM"), g_strdup (EXECUTABLE_NAME));
   
 #ifdef GDK_WINDOWING_X11
-  /* FIXME: moving the tab between windows, or the window between displays will make the next two invalid... */
-  g_hash_table_replace (env_table, g_strdup ("WINDOWID"), 
-                        g_strdup_printf ("%ld", 
+  fprintf (stderr, "get_child_environment\n");
+  if (GDK_IS_X11_WINDOW (gtk_widget_get_window (window)))
+    {
+      /* FIXME: moving the tab between windows, or the window between displays will make the next two invalid... */
+      g_hash_table_replace (env_table, g_strdup ("WINDOWID"), 
+			    g_strdup_printf ("%ld", 
 #if GTK_CHECK_VERSION (2, 91, 6)
-                                         GDK_WINDOW_XID (gtk_widget_get_window (window))));
+					     GDK_WINDOW_XID (gtk_widget_get_window (window))));
 #else
-                                         GDK_WINDOW_XWINDOW (gtk_widget_get_window (window))));
+                                             GDK_WINDOW_XWINDOW (gtk_widget_get_window (window))));
 #endif
-  g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (gtk_widget_get_display (window))));
+      g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (gtk_widget_get_display (window))));
+    }
 #endif
 
   terminal_util_add_proxy_env (env_table);
diff --git a/src/terminal-util.c b/src/terminal-util.c
index e36cba9..04615a9 100644
--- a/src/terminal-util.c
+++ b/src/terminal-util.c
@@ -974,6 +974,8 @@ terminal_util_x11_get_net_wm_desktop (GdkWindow *window,
   gulong n_items, bytes_after;
   gboolean result = FALSE;
 
+  fprintf (stderr, "terminal_util_x11_get_net_wm_desktop\n");
+
 #if GTK_CHECK_VERSION (2, 90, 8)
   display = gdk_window_get_display (window);
 #else
@@ -1027,6 +1029,8 @@ terminal_util_x11_set_net_wm_desktop (GdkWindow *window,
   Atom wm_selection;
   gboolean have_wm;
 
+  fprintf (stderr, "terminal_util_x11_set_net_wm_desktop\n");
+
 #if GTK_CHECK_VERSION (2, 90, 8)
   screen = gdk_window_get_screen (window);
 #else
@@ -1110,6 +1114,8 @@ terminal_util_x11_clear_demands_attention (GdkWindow *window)
   GdkDisplay *display;
   XClientMessageEvent xclient;
 
+  fprintf (stderr, "terminal_util_x11_clear_demands_attention\n");
+
 #if GTK_CHECK_VERSION (2, 90, 8)
   screen = gdk_window_get_screen (window);
 #else
@@ -1176,6 +1182,8 @@ terminal_util_x11_window_is_minimized (GdkWindow *window)
 
   gboolean minimized = FALSE;
 
+  fprintf (stderr, "terminal_util_x11_window_is_minimized\n");
+
   type = None;
   gdk_error_trap_push ();
   XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 27b76a6..433bcb9 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -1648,6 +1648,8 @@ terminal_window_composited_changed_cb (GdkScreen *screen,
   TerminalWindowPrivate *priv = window->priv;
   gboolean composited;
 
+  fprintf (stderr, "terminal_window_composited_changed_cb\n");
+
   composited = gdk_screen_is_composited (screen);
   if ((composited != priv->have_argb_visual) &&
       gtk_widget_get_realized (GTK_WIDGET (window)))
@@ -1723,12 +1725,15 @@ terminal_window_screen_update (TerminalWindow *window,
 {
   TerminalApp *app;
 
-  terminal_window_window_manager_changed_cb (screen, window);
-  g_signal_connect (screen, "window-manager-changed",
-                    G_CALLBACK (terminal_window_window_manager_changed_cb), window);
 #ifdef GDK_WINDOWING_X11
-  g_signal_connect (screen, "composited-changed",
-                    G_CALLBACK (terminal_window_composited_changed_cb), window);
+  if (GDK_IS_X11_SCREEN (screen))
+    {
+      terminal_window_window_manager_changed_cb (screen, window);
+      g_signal_connect (screen, "window-manager-changed",
+			G_CALLBACK (terminal_window_window_manager_changed_cb), window);
+      g_signal_connect (screen, "composited-changed",
+			G_CALLBACK (terminal_window_composited_changed_cb), window);
+    }
 #endif
 
   if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (screen), "GT::HasSettingsConnection")))
diff --git a/src/terminal.c b/src/terminal.c
index 06de533..d08b7d0 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -557,6 +557,7 @@ main (int argc, char **argv)
   g_unsetenv ("GIO_LAUNCHED_DESKTOP_FILE_PID");
   g_unsetenv ("GIO_LAUNCHED_DESKTOP_FILE");
 
+#if 0
  /* Do this here so that gdk_display is initialized */
   if (options->startup_id == NULL)
     {
@@ -567,6 +568,9 @@ main (int argc, char **argv)
 
       options->startup_id = g_strdup_printf ("_TIME%lu", timestamp);
     }
+#else
+      options->startup_id = g_strdup_printf ("_TIME1234");
+#endif
 
   display = gdk_display_get_default ();
   display_name = gdk_display_get_name (display);