diff --git a/main/manager.c b/main/manager.c
index 7cbfcbc52a..dfd8b7b4e1 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -373,7 +373,7 @@ static struct permalias {
 	{ EVENT_FLAG_CDR, "cdr" },
 	{ EVENT_FLAG_DIALPLAN, "dialplan" },
 	{ EVENT_FLAG_ORIGINATE, "originate" },
-	{ -1, "all" },
+	{ INT_MAX, "all" },
 	{ 0, "none" },
 };
 
@@ -448,7 +448,7 @@ static int strings_to_mask(const char *string)
 	for (p = string; *p; p++)
 		if (*p < '0' || *p > '9')
 			break;
-	if (!p)	/* all digits */
+	if (!*p) /* all digits */
 		return atoi(string);
 	if (ast_false(string))
 		return 0;