diff --git a/include/corosync/mar_gen.h b/include/corosync/mar_gen.h
index d1713fb1..16199ba9 100644
--- a/include/corosync/mar_gen.h
+++ b/include/corosync/mar_gen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Red Hat, Inc.
+ * Copyright (C) 2006, 2009 Red Hat, Inc.
  * Copyright (c) 2006-2008 Red Hat, Inc.
  *
  * All rights reserved.
@@ -122,7 +122,7 @@ static inline void swab_mar_name_t (mar_name_t *to_swab)
 
 static inline void marshall_from_mar_name_t (
 	cs_name_t *dest,
-	mar_name_t *src)
+	const mar_name_t *src)
 {
 	dest->length = src->length;
 	memcpy (dest->value, src->value, CS_MAX_NAME_LENGTH);
@@ -130,7 +130,7 @@ static inline void marshall_from_mar_name_t (
 
 static inline void marshall_to_mar_name_t (
 	mar_name_t *dest,
-	cs_name_t *src)
+	const cs_name_t *src)
 {
 	dest->length = src->length;
 	memcpy (dest->value, src->value, CS_MAX_NAME_LENGTH);
diff --git a/services/cfg.c b/services/cfg.c
index fd534572..90e6685d 100644
--- a/services/cfg.c
+++ b/services/cfg.c
@@ -112,7 +112,7 @@ static void message_handler_req_exec_cfg_ringreenable (
         unsigned int nodeid);
 
 static void message_handler_req_exec_cfg_killnode (
-        void *message,
+        const void *message,
         unsigned int nodeid);
 
 static void message_handler_req_exec_cfg_shutdown (
@@ -596,10 +596,10 @@ static void exec_cfg_killnode_endian_convert (void *msg)
 
 
 static void message_handler_req_exec_cfg_killnode (
-        void *message,
+        const void *message,
         unsigned int nodeid)
 {
-	struct req_exec_cfg_killnode *req_exec_cfg_killnode = message;
+	const struct req_exec_cfg_killnode *req_exec_cfg_killnode = message;
 	cs_name_t reason;
 
 	ENTER();