diff --git a/WindowMaker/Defaults/WMWindowAttributes.in b/WindowMaker/Defaults/WMWindowAttributes.in
index aad41fa2..33990cd6 100644
--- a/WindowMaker/Defaults/WMWindowAttributes.in
+++ b/WindowMaker/Defaults/WMWindowAttributes.in
@@ -74,6 +74,7 @@
     SkipWindowList = Yes;
     DontSaveSession = Yes;
     Unfocusable = Yes;
+    NoAppIcon = Yes;
   };
   kio_uiserver = {NoAppIcon = Yes;};
   kcmshell = {NoAppIcon = Yes;};
diff --git a/src/dialog.c b/src/dialog.c
index 8205f83f..c71a8968 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -862,8 +862,8 @@ typedef struct {
 
 
 #define COPYRIGHT_TEXT  \
-    "Copyright \xc2\xa9 1997-2004 Alfredo K. Kojima\n"\
-    "Copyright \xc2\xa9 1998-2004 Dan Pascu"
+    "Copyright \xc2\xa9 1997-2005 Alfredo K. Kojima\n"\
+    "Copyright \xc2\xa9 1998-2005 Dan Pascu"
 
 
 
diff --git a/src/window.c b/src/window.c
index ec936b2e..d6dc9c0e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2250,10 +2250,10 @@ wWindowSynthConfigureNotify(WWindow *wwin)
     sevent.xconfigure.height = wwin->client.height;
 
     sevent.xconfigure.border_width = wwin->old_border_width;
-    if (!HAS_TITLEBAR(wwin))
-        sevent.xconfigure.above = None;
-    else
+    if (HAS_TITLEBAR(wwin) && wwin->frame->titlebar)
         sevent.xconfigure.above = wwin->frame->titlebar->window;
+    else
+        sevent.xconfigure.above = None;
 
     sevent.xconfigure.override_redirect = False;
     XSendEvent(dpy, wwin->client_win, False, StructureNotifyMask, &sevent);