diff --git a/src/common/slurm_accounting_storage.c b/src/common/slurm_accounting_storage.c
index 631ad9653f4f2bc2e67e049d2686a92e070ed514..94451cf82da5980d517f0456dcda8f53a54cacba 100644
--- a/src/common/slurm_accounting_storage.c
+++ b/src/common/slurm_accounting_storage.c
@@ -1854,6 +1854,7 @@ extern int unpack_acct_association_rec(void **object, uint16_t rpc_version,
 	*object = object_ptr;
 
 	init_acct_association_rec(object_ptr);
+
 	if (rpc_version >= 4) {
 		safe_unpack32(&count, buffer);
 		if(count != NO_VAL) {
diff --git a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
index 997bba822b4814cee8e53803de3247e39b391938..f2affc0f4c5957abdf15ca1f198d2242a71868c4 100644
--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
+++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
@@ -1138,6 +1138,7 @@ extern int jobacct_storage_p_job_start(PGconn *acct_pgsql_db,
 	char *block_id = NULL;
 	char *query = NULL;
 	int reinit = 0;
+	char *wckey = NULL;
 
 	if (!job_ptr->details || !job_ptr->details->submit_time) {
 		error("jobacct_storage_p_job_start: "