diff --git a/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c b/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
index 705791d7c97dd8fe3c1cbc2b40d3e8e163ceab88..3fea73d5a053a18af289ebb2377ec6fe0bed6068 100644
--- a/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
+++ b/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
@@ -819,7 +819,7 @@ extern List jobacct_storage_p_get_jobs_cond(void *db_conn,
 	params.opt_uid = -1;
 
 	if(job_cond->cluster_list && list_count(job_cond->cluster_list)) {
-		params.cluster = list_pop(job_cond->cluster_list);
+		params.opt_cluster = list_pop(job_cond->cluster_list);
 	}
 	if(job_cond->user_list && list_count(job_cond->user_list)) {
 		char *user = list_pop(job_cond->user_list);
@@ -832,8 +832,8 @@ extern List jobacct_storage_p_get_jobs_cond(void *db_conn,
 	return filetxt_jobacct_process_get_jobs(job_cond->step_list, 
 						job_cond->partition_list,
 						&params);
-	if(params.cluster)
-		xfree(params.cluster);
+	if(params.opt_cluster)
+		xfree(params.opt_cluster);
 }
 
 /* 
diff --git a/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c b/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c
index 2ef19382e8837d7772c919680f49145ba8b1811f..53fd0a565acd6a593ad5669fb3d145f09b9719cf 100644
--- a/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c
+++ b/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c
@@ -56,7 +56,7 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn,
 	char *object = NULL;
 	jobacct_selected_step_t *selected_step = NULL;
 	ListIterator itr = NULL;
-	int set = 0, assoc_set=0;
+	int set = 0;
 	char *table_level="t2";
 	MYSQL_RES *result = NULL, *step_result = NULL;
 	MYSQL_ROW row, step_row;
@@ -209,7 +209,6 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn,
 		}
 		list_iterator_destroy(itr);
 		xstrcat(extra, ")");
-		assoc_set=1;
 		table_level="t3";
 		/* just incase the association is gone */
 		if(set) 
diff --git a/src/plugins/accounting_storage/none/accounting_storage_none.c b/src/plugins/accounting_storage/none/accounting_storage_none.c
index 9a7dda713501970456681aaf0c9f6aa7fbf225c2..61cea5b3e70a01ab87ba52735f46bc414ed99c3e 100644
--- a/src/plugins/accounting_storage/none/accounting_storage_none.c
+++ b/src/plugins/accounting_storage/none/accounting_storage_none.c
@@ -331,8 +331,7 @@ extern List jobacct_storage_p_get_jobs(void *db_conn,
  * returns List of jobacct_job_rec_t *
  * note List needs to be freed when called
  */
-extern List jobacct_storage_p_get_jobs_cond(void *db_conn,
-					    sacct_job_cond_t *job_cond)
+extern List jobacct_storage_p_get_jobs_cond(void *db_conn, void *job_cond)
 {
 	return NULL;
 }