diff --git a/include/corosync/cfg.h b/include/corosync/cfg.h
index 7c201bbb..127fedf6 100644
--- a/include/corosync/cfg.h
+++ b/include/corosync/cfg.h
@@ -203,7 +203,7 @@ cs_error_t
 corosync_cfg_kill_node (
 	corosync_cfg_handle_t cfg_handle,
 	unsigned int nodeid,
-	char *reason);
+	const char *reason);
 
 cs_error_t
 corosync_cfg_try_shutdown (
@@ -231,7 +231,7 @@ cs_error_t
 corosync_cfg_get_node_addrs (
 	corosync_cfg_handle_t cfg_handle,
 	int nodeid,
-	int max_addrs,
+	size_t max_addrs,
 	int *num_addrs,
 	corosync_cfg_node_address_t *addrs);
 
diff --git a/lib/cfg.c b/lib/cfg.c
index 8ff23680..c61f63b1 100644
--- a/lib/cfg.c
+++ b/lib/cfg.c
@@ -678,7 +678,7 @@ cs_error_t
 corosync_cfg_kill_node (
 	corosync_cfg_handle_t cfg_handle,
 	unsigned int nodeid,
-	char *reason)
+	const char *reason)
 {
 	struct cfg_instance *cfg_instance;
 	struct req_lib_cfg_killnode req_lib_cfg_killnode;
@@ -800,7 +800,7 @@ corosync_cfg_replyto_shutdown (
 cs_error_t corosync_cfg_get_node_addrs (
 	corosync_cfg_handle_t cfg_handle,
 	int nodeid,
-	int max_addrs,
+	size_t max_addrs,
 	int *num_addrs,
 	corosync_cfg_node_address_t *addrs)
 {