diff --git a/common/util.c b/common/util.c
index d63698535..38ac93671 100644
--- a/common/util.c
+++ b/common/util.c
@@ -96,6 +96,7 @@ pid_t get_parent_pid(pid_t child) {
 			parent = strtol(token, NULL, 10);
 		}
 
+		free(buffer);
 		fclose(stat);
 	}
 
diff --git a/sway/commands/split.c b/sway/commands/split.c
index e3045a4f0..1624eebe9 100644
--- a/sway/commands/split.c
+++ b/sway/commands/split.c
@@ -62,22 +62,21 @@ struct cmd_results *cmd_split(int argc, char **argv) {
 		return error;
 	}
 	if (strcasecmp(argv[0], "v") == 0 || strcasecmp(argv[0], "vertical") == 0) {
-		_do_split(argc - 1, argv + 1, L_VERT);
+		return _do_split(argc - 1, argv + 1, L_VERT);
 	} else if (strcasecmp(argv[0], "h") == 0 || strcasecmp(argv[0], "horizontal") == 0) {
-		_do_split(argc - 1, argv + 1, L_HORIZ);
+		return _do_split(argc - 1, argv + 1, L_HORIZ);
 	} else if (strcasecmp(argv[0], "t") == 0 || strcasecmp(argv[0], "toggle") == 0) {
 		swayc_t *focused = current_container;
 		if (focused->parent->layout == L_VERT) {
-			_do_split(argc - 1, argv + 1, L_HORIZ);
+			return _do_split(argc - 1, argv + 1, L_HORIZ);
 		} else {
-			_do_split(argc - 1, argv + 1, L_VERT);
+			return _do_split(argc - 1, argv + 1, L_VERT);
 		}
 	} else {
 		error = cmd_results_new(CMD_FAILURE, "split",
 			"Invalid split command (expected either horizontal or vertical).");
 		return error;
 	}
-	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
 
 struct cmd_results *cmd_splitv(int argc, char **argv) {
diff --git a/sway/workspace.c b/sway/workspace.c
index 42525f3d7..ab27ff56b 100644
--- a/sway/workspace.c
+++ b/sway/workspace.c
@@ -368,6 +368,7 @@ swayc_t *workspace_for_pid(pid_t pid) {
 			ws = workspace_create(pw->workspace);
 		}
 
+		free_pid_workspace(pw);
 		list_del(config->pid_workspaces, i);
 	}