diff --git a/ldms/src/core/ldms_xprt.c b/ldms/src/core/ldms_xprt.c
index 28497b1fc..06dbb1653 100644
--- a/ldms/src/core/ldms_xprt.c
+++ b/ldms/src/core/ldms_xprt.c
@@ -1763,7 +1763,7 @@ static void __handle_update_data(ldms_t x, struct ldms_context *ctxt,
 	struct ldms_set *set = s->set;
 	int n;
 	struct ldms_data_hdr *data, *prev_data;
-	int flags, upd_curr_idx;
+	int flags = 0, upd_curr_idx;
 
 	assert(ctxt->update.cb);
 	rc = LDMS_UPD_ERROR(ev->status);
diff --git a/ldms/src/ldmsd/ldmsctl.c b/ldms/src/ldmsd/ldmsctl.c
index a7d246891..6aa50c726 100644
--- a/ldms/src/ldmsd/ldmsctl.c
+++ b/ldms/src/ldmsd/ldmsctl.c
@@ -1954,6 +1954,7 @@ int main(int argc, char *argv[])
 	}
 
 	do {
+		cnt = 0;
 #ifdef HAVE_LIBREADLINE
 #ifndef HAVE_READLINE_HISTORY
 		if (linebuf != NULL) {
diff --git a/ldms/src/ldmsd/ldmsd.c b/ldms/src/ldmsd/ldmsd.c
index d88f10771..90d505f71 100644
--- a/ldms/src/ldmsd/ldmsd.c
+++ b/ldms/src/ldmsd/ldmsd.c
@@ -924,7 +924,7 @@ static int start_task(ldmsd_task_t task)
 static void task_cb_fn(ovis_event_t ev)
 {
 	ldmsd_task_t task = ev->param.ctxt;
-	enum ldmsd_task_state next_state;
+	enum ldmsd_task_state next_state = 0;
 
 	pthread_mutex_lock(&task->lock);
 	if (task->os) {
@@ -1503,7 +1503,7 @@ int main(int argc, char *argv[])
 	char *lval = NULL;
 	char *rval = NULL;
 	char *plug_name = NULL;
-	const char *port;
+	const char *port = NULL;
 	int list_plugins = 0;
 	int ret;
 	int sample_interval = 2000000;
@@ -1958,7 +1958,7 @@ int main(int argc, char *argv[])
 			ldms = listen_on_ldms_xprt(xprt_str, port_str);
 			free(dup_arg);
 			if (!ldms) {
-				cleanup(ret, "Error setting up ldms transport");
+				cleanup(errno, "Error setting up ldms transport");
 			}
 			break;
 		}
diff --git a/ldms/src/ldmsd/ldmsd_request_util.c b/ldms/src/ldmsd/ldmsd_request_util.c
index 4392743a0..c5217a539 100644
--- a/ldms/src/ldmsd/ldmsd_request_util.c
+++ b/ldms/src/ldmsd/ldmsd_request_util.c
@@ -589,8 +589,10 @@ struct ldmsd_req_array *ldmsd_parse_config_str(const char *cfg, uint32_t msg_no,
 	ctxt.msglog = msglog;
 	ctxt.av = av;
 	ctxt.request = calloc(1, ctxt.request_sz);
-	if (!ctxt.request)
+	if (!ctxt.request) {
+		rc = ENOMEM;
 		goto err;
+	}
 
 	ctxt.request->marker = LDMSD_RECORD_MARKER;
 	ctxt.request->type = LDMSD_REQ_TYPE_CONFIG_CMD;
diff --git a/ldms/src/ldmsd/ldmsd_updtr.c b/ldms/src/ldmsd/ldmsd_updtr.c
index 2d446bbe6..9e9d57367 100644
--- a/ldms/src/ldmsd/ldmsd_updtr.c
+++ b/ldms/src/ldmsd/ldmsd_updtr.c
@@ -824,7 +824,7 @@ void __prdcr_set_update_sched(ldmsd_prdcr_set_t prd_set,
 int ldmsd_updtr_tasks_update(ldmsd_updtr_t updtr, ldmsd_prdcr_set_t prd_set)
 {
 	ldmsd_updtr_task_t task;
-	int rc;
+	int rc = 0;
 
 	if (!updtr->is_auto_task) {
 		/*
@@ -920,7 +920,7 @@ ldmsd_updtr_new_with_auth(const char *name, char *interval_str, char *offset_str
 					uid_t uid, gid_t gid, int perm)
 {
 	struct ldmsd_updtr *updtr;
-	long interval_us, offset_us;
+	long interval_us = UPDTR_TREE_MGMT_TASK_INTRVL, offset_us = LDMSD_UPDT_HINT_OFFSET_NONE;
 	updtr = (struct ldmsd_updtr *)
 		ldmsd_cfgobj_new_with_auth(name, LDMSD_CFGOBJ_UPDTR,
 				 sizeof *updtr, ldmsd_updtr___del,
diff --git a/ldms/src/sampler/examples/array_example/all_example.c b/ldms/src/sampler/examples/array_example/all_example.c
index 327071283..a4a9d79d2 100644
--- a/ldms/src/sampler/examples/array_example/all_example.c
+++ b/ldms/src/sampler/examples/array_example/all_example.c
@@ -112,6 +112,7 @@ static int create_metric_set(base_data_t base)
 
 	schema = base_schema_new(base);
 	if (!schema){
+		rc = errno;
 		msglog(LDMSD_LERROR,
 		       "%s: The schema '%s' could not be created, errno=%d.\n",
 		       __FILE__, base->schema_name, errno);
@@ -158,17 +159,19 @@ static int create_metric_set(base_data_t base)
 }
 static int config(struct ldmsd_plugin *self, struct attr_value_list *kwl, struct attr_value_list *avl)
 {
-
+	int rc;
 	if (set) {
 		msglog(LDMSD_LERROR, "all_example: Set already created.\n");
 		return EINVAL;
 	}
 
 	base = base_config(avl, SAMP, SAMP, msglog);
-	if (!base)
+	if (!base) {
+		rc = errno;
 		goto err;
+	}
 
-	int rc = create_metric_set(base);
+	rc = create_metric_set(base);
 	if (rc) {
 		msglog(LDMSD_LERROR, SAMP ": failed to create a metric set.\n");
 		goto err;
diff --git a/ldms/src/sampler/examples/synthetic/synthetic.c b/ldms/src/sampler/examples/synthetic/synthetic.c
index 661cb23e5..0e0b56bef 100644
--- a/ldms/src/sampler/examples/synthetic/synthetic.c
+++ b/ldms/src/sampler/examples/synthetic/synthetic.c
@@ -191,8 +191,10 @@ static int config(struct ldmsd_plugin *self, struct attr_value_list *kwl, struct
 		compid = strtoull(value, NULL, 0);
 
 	base = base_config(avl, SAMP, SAMP, msglog);
-	if (!base)
+	if (!base) {
+		rc = errno;
 		goto err;
+	}
 
 	rc = create_metric_set(base);
 	if (rc) {
diff --git a/ldms/src/sampler/papi/papi_config.c b/ldms/src/sampler/papi/papi_config.c
index 672e63e1b..a139a70be 100644
--- a/ldms/src/sampler/papi/papi_config.c
+++ b/ldms/src/sampler/papi/papi_config.c
@@ -68,6 +68,7 @@ int papi_process_config_data(job_data_t job, char *buf, size_t buflen, ldmsd_msg
 	if (!p) {
 		msglog(LDMSD_LERROR,
 		       "papi_sampler: Parser could not be created.\n");
+		rc = ENOMEM;
 		goto out;
 	}
 
@@ -83,6 +84,7 @@ int papi_process_config_data(job_data_t job, char *buf, size_t buflen, ldmsd_msg
 		msglog(LDMSD_LERROR,
 		       "papi_sampler: The configuration file is missing the "
 		       "'schema' attribute.\n");
+		rc = ENOENT;
 		goto out;
 	}
 	events_attr = json_attr_find(e, "events");
@@ -90,17 +92,20 @@ int papi_process_config_data(job_data_t job, char *buf, size_t buflen, ldmsd_msg
 		msglog(LDMSD_LERROR,
 		       "papi_sampler: The configuration file is missing the "
 		       "'events' attribute.\n");
+		rc = ENOENT;
 		goto out;
 	}
 	if (JSON_STRING_VALUE != json_entity_type(json_attr_value(schema_attr))) {
 		msglog(LDMSD_LERROR,
 		       "papi_sampler: The 'schema' attribute must be a string.\n");
+		rc = EINVAL;
 		goto out;
 	}
 	events_list = json_attr_value(events_attr);
 	if (JSON_LIST_VALUE != json_entity_type(events_list)) {
 		msglog(LDMSD_LERROR,
 		       "papi_sampler: The 'events' attribute must be a list.\n");
+		rc = EINVAL;
 		goto out;
 	}
 
@@ -109,6 +114,7 @@ int papi_process_config_data(job_data_t job, char *buf, size_t buflen, ldmsd_msg
 	if (!job->schema_name) {
 		msglog(LDMSD_LERROR,
 		       "papi_sampler: Error duplicating schema name string.\n");
+		rc = ENOMEM;
 		goto out;
 	}
 
diff --git a/ldms/src/sampler/procdiskstats.c b/ldms/src/sampler/procdiskstats.c
index 2975cfa1b..ab2649e33 100644
--- a/ldms/src/sampler/procdiskstats.c
+++ b/ldms/src/sampler/procdiskstats.c
@@ -290,6 +290,7 @@ static int create_metric_set(base_data_t base, struct attr_value_list *avl){
 
 	schema = base_schema_new(base);
 	if (!schema) {
+		rc = errno;
 		msglog(LDMSD_LERROR,
 			SAMP ": The schema '%s' could not be created, errno=%d.\n",
 		       base->schema_name, errno);
diff --git a/ldms/src/sampler/spank/slurm_notifier.c b/ldms/src/sampler/spank/slurm_notifier.c
index f9dc69d97..bab3260bf 100644
--- a/ldms/src/sampler/spank/slurm_notifier.c
+++ b/ldms/src/sampler/spank/slurm_notifier.c
@@ -280,6 +280,7 @@ static void event_cb(ldms_t x, ldms_xprt_event_t e, void *cb_arg)
 		event = "error";
 		break;
 	default:
+		event = "INVALID_EVENT";
 		DEBUG2("Received invalid event type\n");
 	}
 	pthread_mutex_unlock(&client->wait_lock);
diff --git a/lib/src/ovis_event/ovis_event.c b/lib/src/ovis_event/ovis_event.c
index 59d39c111..b7b750c27 100644
--- a/lib/src/ovis_event/ovis_event.c
+++ b/lib/src/ovis_event/ovis_event.c
@@ -621,6 +621,8 @@ int ovis_event_term_check(ovis_scheduler_t m)
 	case OVIS_EVENT_MANAGER_TERM:
 		rc = EINTR;
 		break;
+	default:
+		rc = EINVAL;
 	}
 	pthread_mutex_unlock(&m->mutex);
 	return rc;
@@ -720,6 +722,8 @@ int ovis_scheduler_term(ovis_scheduler_t m)
 	case OVIS_EVENT_MANAGER_TERM:
 		rc = EINVAL;
 		break;
+	default:
+		rc = EINVAL;
 	}
 	pthread_mutex_unlock(&m->mutex);
 	return rc;