diff --git a/sway/commands/assign.c b/sway/commands/assign.c
index bf0b1f63d..eb7329aa4 100644
--- a/sway/commands/assign.c
+++ b/sway/commands/assign.c
@@ -22,7 +22,7 @@ struct cmd_results *cmd_assign(int argc, char **argv) {
 	}
 
 	char *movecmd = "move container to workspace ";
-	int arglen = strlen(movecmd) + strlen(*argv) + 1;
+	size_t arglen = strlen(movecmd) + strlen(*argv) + 1;
 	char *cmdlist = calloc(1, arglen);
 	if (!cmdlist) {
 		return cmd_results_new(CMD_FAILURE, "assign", "Unable to allocate command list");
diff --git a/sway/commands/for_window.c b/sway/commands/for_window.c
index a6aa71871..dd5461f03 100644
--- a/sway/commands/for_window.c
+++ b/sway/commands/for_window.c
@@ -14,7 +14,7 @@ struct cmd_results *cmd_for_window(int argc, char **argv) {
 	// add command to a criteria/command pair that is run against views when they appear.
 	char *criteria = argv[0], *cmdlist = join_args(argv + 1, argc - 1);
 
-	struct criteria *crit = malloc(sizeof(struct criteria));
+	struct criteria *crit = calloc(sizeof(struct criteria), 1);
 	if (!crit) {
 		return cmd_results_new(CMD_FAILURE, "for_window", "Unable to allocate criteria");
 	}