diff --git a/src/event.c b/src/event.c
index 57e1ac2..8f8cb1a 100644
--- a/src/event.c
+++ b/src/event.c
@@ -93,15 +93,10 @@ event_configureevent(XEvent *e)
 
      if((c = client_gb_win(ev->window)))
      {
-         /* if(ev->value_mask & CWX)
-               c->geo.x = ev->x;
-          if(ev->value_mask & CWY)
-               c->geo.y = ev->y; */
-
           if(ev->value_mask & CWWidth)
-               _fac_resize(c, Right, (ev->width - (c->geo.w - c->border - c->border)));
+               _fac_resize(c, Right, ev->width - c->wgeo.w);
           if(ev->value_mask & CWHeight)
-               _fac_resize(c, Bottom, (ev->height - (c->geo.h - c->tbarw)));
+               _fac_resize(c, Bottom, ev->height - c->wgeo.h);
 
           client_apply_tgeo(c->tag);
      }
diff --git a/src/mouse.c b/src/mouse.c
index 33037c0..8d3c5b0 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -73,7 +73,7 @@ static struct tag*
 mouse_drag_tag(struct client *c, Window w)
 {
      struct barwin *b;
-     struct tag *t;
+     struct tag *t = NULL;
      Window rw;
      int d, u;
 
@@ -93,7 +93,7 @@ void
 mouse_move(struct client *c, bool type)
 {
      struct client *c2 = NULL, *last = c;
-     struct tag *t;
+     struct tag *t = NULL;
      XEvent ev;
      Window w;
      int d, u;