diff --git a/client.c b/client.c
index d03a5b851..556d044f1 100644
--- a/client.c
+++ b/client.c
@@ -1000,9 +1000,6 @@ client_kill(Client *c)
         ev.data.data32[0] = xutil_intern_atom(globalconf.connection, "WM_DELETE_WINDOW");
         ev.data.data32[1] = XCB_CURRENT_TIME;
 
-        /* TODO: really useful? */
-        ev.data.data32[2] = ev.data.data32[3] = ev.data.data32[4] = 0;
-
         xcb_send_event(globalconf.connection, false, c->win,
                        XCB_EVENT_MASK_NO_EVENT, (char *) &ev);
     }
diff --git a/event.c b/event.c
index 44ce34184..d34191e64 100644
--- a/event.c
+++ b/event.c
@@ -545,7 +545,7 @@ event_handle_unmapnotify(void *data __attribute__ ((unused)),
      * 0x80)  in XCB  because the  SendEvent bit  is available  in the
      * response_type field
      */
-    bool send_event = ((ev->response_type & 0x80) >> 7);
+    bool send_event = ((ev->response_type & 0x7f) >> 7);
 
     if((c = client_get_bywin(globalconf.clients, ev->window))
        && ev->event == xcb_aux_get_screen(connection, c->phys_screen)->root