diff --git a/exec/amf.c b/exec/amf.c
index d7ffd9d4..51e1d4e2 100644
--- a/exec/amf.c
+++ b/exec/amf.c
@@ -2392,7 +2392,7 @@ static int amf_init_two_fn (struct conn_info *conn_info)
 
 static int message_handler_req_amf_componentregister (struct conn_info *conn_info, void *message)
 {
-	struct req_lib_amf_componentregister *req_lib_amf_componentregister = (struct req_amf_componentregister *)message;
+	struct req_lib_amf_componentregister *req_lib_amf_componentregister = (struct req_lib_amf_componentregister *)message;
 	struct req_exec_amf_componentregister req_exec_amf_componentregister;
 	struct iovec iovecs[2];
 
diff --git a/exec/ckpt.c b/exec/ckpt.c
index 489f07fd..72c7d27b 100644
--- a/exec/ckpt.c
+++ b/exec/ckpt.c
@@ -3153,7 +3153,6 @@ static int message_handler_req_lib_ckpt_sectionoverwrite (struct conn_info *conn
 	struct iovec iovecs[2];
 	struct saCkptCheckpoint *checkpoint;
 	struct res_lib_ckpt_sectionoverwrite res_lib_ckpt_sectionoverwrite;
-	SaAisErrorT error = SA_AIS_ERR_NOT_EXIST;
 
 	log_printf (LOG_LEVEL_DEBUG, "Section overwrite from API fd %d\n", conn_info->fd);
 	checkpoint = ckpt_checkpoint_find_global (&req_lib_ckpt_sectionoverwrite->checkpointName);