diff --git a/ChangeLog b/ChangeLog
index 63f9ab3b4..bc4b9a1a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-11-24  Havoc Pennington  <hp@redhat.com>
+
+	* src/iconcache.c (meta_icon_cache_init): init prev_mask field
+
+	* src/window.c (meta_window_new_with_attrs): init xgroup_leader
+	prior to use
+
 2003-11-24  Havoc Pennington  <hp@redhat.com>
 
 	* src/display.c (meta_display_begin_grab_op): add an event_serial
diff --git a/src/iconcache.c b/src/iconcache.c
index fb4e57dc5..ead3de48b 100644
--- a/src/iconcache.c
+++ b/src/iconcache.c
@@ -520,6 +520,7 @@ meta_icon_cache_init (MetaIconCache *icon_cache)
 
   icon_cache->origin = USING_NO_ICON;
   icon_cache->prev_pixmap = None;
+  icon_cache->prev_mask = None;
 #if 0
   icon_cache->icon = NULL;
   icon_cache->mini_icon = NULL;
diff --git a/src/window.c b/src/window.c
index 552f09032..3a01d27a9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -377,11 +377,6 @@ meta_window_new_with_attrs (MetaDisplay       *display,
 
   window->desc = g_strdup_printf ("0x%lx", window->xwindow);
 
-  /* assign the window to its group, or create a new group if needed
-   */
-  window->group = NULL;
-  meta_window_compute_group (window);
-
   /* avoid tons of stack updates */
   meta_stack_freeze (window->screen->stack);
 
@@ -491,7 +486,6 @@ meta_window_new_with_attrs (MetaDisplay       *display,
   window->net_wm_pid = -1;
   
   window->xtransient_for = None;
-  window->xgroup_leader = None;
   window->xclient_leader = None;
   window->transient_parent_is_root_window = FALSE;
   
@@ -509,7 +503,15 @@ meta_window_new_with_attrs (MetaDisplay       *display,
   window->layer = META_LAYER_LAST; /* invalid value */
   window->stack_position = -1;
   window->initial_workspace = 0; /* not used */
+  
   meta_display_register_x_window (display, &window->xwindow, window);
+
+
+  /* assign the window to its group, or create a new group if needed
+   */
+  window->group = NULL;
+  window->xgroup_leader = None;
+  meta_window_compute_group (window);
   
   /* Fill these in the order we want them to be gotten.
    * we want to get window name and class first