diff --git a/ChangeLog b/ChangeLog
index 419252148..a684d482b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-03-06  Havoc Pennington  <hp@pobox.com>
+
+	* src/core.c (meta_core_get_grab_frame): add some assertions
+
+	* src/menu.c (meta_window_menu_new): make another warning 
+	into a verbose
+
+	* src/display.c (meta_change_button_grab): use verbose rather than
+	warning to log failures to grab button, since these are typically
+	BadWindow from a destroyed window.
+
 2002-03-06  Havoc Pennington  <hp@redhat.com>
 
 	* src/frames.c (meta_frames_manage_window): use hash_table_replace
diff --git a/src/core.c b/src/core.c
index 631f46cdb..4f6f7b0e8 100644
--- a/src/core.c
+++ b/src/core.c
@@ -525,6 +525,10 @@ meta_core_get_grab_frame (Display *xdisplay)
   
   display = meta_display_for_x_display (xdisplay);
 
+  g_assert (display != NULL);
+  g_assert (display->grab_window != NULL);
+  g_assert (display->grab_window->display->xdisplay == xdisplay);
+  
   if (display->grab_op != META_GRAB_OP_NONE &&
       display->grab_window->frame)
     return display->grab_window->frame->xwindow;
diff --git a/src/display.c b/src/display.c
index 2e387854f..c40a85238 100644
--- a/src/display.c
+++ b/src/display.c
@@ -2091,7 +2091,7 @@ meta_change_button_grab (MetaDisplay *display,
       result = meta_error_trap_pop (display);
 
       if (result != Success)
-        meta_warning ("Failed to grab button %d with mask 0x%x for window 0x%lx error code %d\n",
+        meta_verbose ("Failed to grab button %d with mask 0x%x for window 0x%lx error code %d\n",
                       button, modmask | ignored_mask, xwindow, result);
       
       ++ignored_mask;
diff --git a/src/menu.c b/src/menu.c
index a803c0c81..59a9e7a39 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -281,7 +281,7 @@ meta_window_menu_new   (MetaFrames         *frames,
 
   if (ops & META_MENU_OP_WORKSPACES)
     {
-      meta_warning ("Creating %d-workspace menu current %d\n",
+      meta_verbose ("Creating %d-workspace menu current space %d\n",
                     n_workspaces, active_workspace);
       
       if (n_workspaces > 0)