diff --git a/client.c b/client.c
index 64553a93..66092b2f 100644
--- a/client.c
+++ b/client.c
@@ -47,9 +47,14 @@ create_client(Window w, XWindowAttributes *wa) {
 	XAddToSaveSet(blz.dpy, c->win);
 	fwa.override_redirect = 1;
 	fwa.background_pixmap = ParentRelative;
-	fwa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
-		| ExposureMask | PointerMotionMask | KeyPressMask
-		| ButtonPressMask | ButtonReleaseMask;
+	fwa.event_mask =
+		  SubstructureRedirectMask
+		| SubstructureNotifyMask
+		| ExposureMask
+		| PointerMotionMask
+		| KeyPressMask
+		| ButtonPressMask
+		| ButtonReleaseMask;
 	c->framewin = XCreateWindow(
 		/* display */	blz.dpy,
 		/* parent */	blz.root,
@@ -195,7 +200,10 @@ focus(Client *c, Bool restack) {
 	View *v;
 	Frame *f;
 
-	if(!(f = c->sel)) return;
+	f = c->sel;
+	if(!f)
+		return;
+
 	v = f->area->view;
 	arrange_column(f->area, False);
 	focus_view(screen, v);
diff --git a/main.c b/main.c
index e4fba5d2..f2328ab7 100644
--- a/main.c
+++ b/main.c
@@ -243,6 +243,12 @@ init_traps() {
 	}
 }
 
+void
+check_9pcon(IXPConn *c) {
+	serve_9pcon(c);
+	check_x_event(c);
+}
+
 int
 main(int argc, char *argv[]) {
 	char *wmiirc, *errstr, *namespace, *tmp;
@@ -366,7 +372,7 @@ main(int argc, char *argv[]) {
 		}
 	}
 
-	ixp_server_open_conn(&srv, i, &p9srv, serve_9pcon, nil);
+	ixp_server_open_conn(&srv, i, &p9srv, check_9pcon, nil);
 	ixp_server_open_conn(&srv, ConnectionNumber(blz.dpy), nil, check_x_event, nil);
 
 	view = nil;