diff --git a/src/ctl/ctl_internal.h b/src/ctl/ctl_internal.h
index a043b01c40..494cbeda96 100644
--- a/src/ctl/ctl_internal.h
+++ b/src/ctl/ctl_internal.h
@@ -75,8 +75,8 @@ struct ctl_argument_parser {
 };
 
 struct ctl_argument {
-    size_t dest_size;                     /* size of the entire argument */
-    struct ctl_argument_parser parsers[]; /* array of 'fields' in arg */
+    size_t dest_size;                      /* size of the entire argument */
+    struct ctl_argument_parser parsers[8]; /* array of 'fields' in arg */
 };
 
 #define sizeof_member(type, member) sizeof(((type *)0)->member)
diff --git a/src/pool/pool_disjoint.c b/src/pool/pool_disjoint.c
index b9a37d98e8..dc42eb7966 100644
--- a/src/pool/pool_disjoint.c
+++ b/src/pool/pool_disjoint.c
@@ -27,7 +27,7 @@
 #include "utils_log.h"
 #include "utils_math.h"
 
-static char *DEFAULT_NAME = "disjoint";
+static const char *DEFAULT_NAME = "disjoint";
 
 /* Disjoint pool CTL implementation */
 struct ctl disjoint_ctl_root;