diff --git a/main.c b/main.c
index 9856354..daeaa0a 100644
--- a/main.c
+++ b/main.c
@@ -55,6 +55,7 @@ cleanup()
 	XDestroyWindow(dpy, barwin);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 	XSync(dpy, False);
+	free(seltag);
 }
 
 static void
diff --git a/view.c b/view.c
index ac201e6..ce122ed 100644
--- a/view.c
+++ b/view.c
@@ -41,7 +41,7 @@ reorder()
 static Client *
 nexttiled(Client *c)
 {
-	for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
+	for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
 	return c;
 }
 
@@ -325,7 +325,7 @@ zoom(Arg *arg)
 		return;
 
 	if((c = sel) == nexttiled(clients))
-		if(!(c = nexttiled(c)))
+		if(!(c = nexttiled(c->next)))
 			return;
 	detach(c);
 	c->next = clients;