diff --git a/sort.c b/sort.c
index dcacfb1d..a9e5da5c 100644
--- a/sort.c
+++ b/sort.c
@@ -425,11 +425,11 @@ sort_get_clients(u_int *n, struct sort_criteria *sort_crit)
 
 	i = 0;
 	TAILQ_FOREACH(c, &clients, entry) {
-	       if (c->flags & CLIENT_UNATTACHEDFLAGS)
-		       continue;
-	       if (~c->flags & CLIENT_ATTACHED)
-		       continue;
-	       if (lsz <= i) {
+		if (c->flags & CLIENT_UNATTACHEDFLAGS)
+			continue;
+		if (~c->flags & CLIENT_ATTACHED)
+			continue;
+		if (lsz <= i) {
 			lsz += 100;
 			l = xreallocarray(l, lsz, sizeof *l);
 		}
diff --git a/window.c b/window.c
index bd710733..d4b97385 100644
--- a/window.c
+++ b/window.c
@@ -2102,7 +2102,7 @@ window_pane_tiled_geometry(struct window *w, struct window_pane *wp,
 	} else if (args_has(args, 'p')) {
 		size = args_strtonum_and_expand(args, 'p', 0, 100, item,
 		    cause);
-		if (cause == NULL)
+		if (*cause == NULL)
 			size = curval * size / 100;
 	}
 	if (*cause != NULL)