diff --git a/src/sacctmgr/file_functions.c b/src/sacctmgr/file_functions.c
index 6d5061eae364bb1dc94eacbae3811cabd9b39b3d..fe8dfcd5ff761eecfaf5669c90457d096427b076 100644
--- a/src/sacctmgr/file_functions.c
+++ b/src/sacctmgr/file_functions.c
@@ -1751,15 +1751,16 @@ static int _print_file_slurmdb_hierarchical_rec_childern(FILE *fd,
 	char *line = NULL;
 	slurmdb_user_rec_t *user_rec = NULL;
 	slurmdb_account_rec_t *acct_rec = NULL;
-	uint16_t track_wckey = slurm_get_track_wckey();
 
 	itr = list_iterator_create(slurmdb_hierarchical_rec_list);
 	while((slurmdb_hierarchical_rec = list_next(itr))) {
 		if(slurmdb_hierarchical_rec->assoc->user) {
 			user_rec = sacctmgr_find_user_from_list(
-				user_list, slurmdb_hierarchical_rec->assoc->user);
+				user_list,
+				slurmdb_hierarchical_rec->assoc->user);
 			line = xstrdup_printf(
-				"User - %s", slurmdb_hierarchical_rec->sort_name);
+				"User - %s",
+				slurmdb_hierarchical_rec->sort_name);
 			if(slurmdb_hierarchical_rec->assoc->partition)
 				xstrfmtcat(line, ":Partition='%s'",
 					   slurmdb_hierarchical_rec->
@@ -1767,8 +1768,7 @@ static int _print_file_slurmdb_hierarchical_rec_childern(FILE *fd,
 			if(user_rec) {
 				xstrfmtcat(line, ":DefaultAccount='%s'",
 					   user_rec->default_acct);
-				if(track_wckey
-				   && user_rec->default_wckey
+				if(user_rec->default_wckey
 				   && user_rec->default_wckey[0])
 					xstrfmtcat(line, ":DefaultWCKey='%s'",
 						   user_rec->default_wckey);
diff --git a/src/sreport/cluster_reports.c b/src/sreport/cluster_reports.c
index 2f6af4cec974cd029a428e974e0c88f6d3fdc4ad..3a17a78aaead2c847ac495fef1bab65d55b26e06 100644
--- a/src/sreport/cluster_reports.c
+++ b/src/sreport/cluster_reports.c
@@ -536,6 +536,7 @@ static List _get_cluster_list(int argc, char *argv[], uint32_t *total_time,
 	int i=0;
 	List cluster_list = NULL;
 
+	slurmdb_init_cluster_cond(cluster_cond);
 	cluster_cond->with_deleted = 1;
 	cluster_cond->with_usage = 1;
 
@@ -603,7 +604,7 @@ extern int cluster_account_by_user(int argc, char *argv[])
 
 	print_fields_list = list_create(destroy_print_field);
 
-	memset(&cluster_cond, 0, sizeof(slurmdb_cluster_cond_t));
+	slurmdb_init_cluster_cond(&cluster_cond);
 
 	assoc_cond->with_sub_accts = 1;
 
@@ -791,7 +792,7 @@ extern int cluster_user_by_account(int argc, char *argv[])
 
 	print_fields_list = list_create(destroy_print_field);
 
-	memset(&cluster_cond, 0, sizeof(slurmdb_cluster_cond_t));
+	slurmdb_init_cluster_cond(&cluster_cond);
 
 	_set_assoc_cond(&i, argc, argv, assoc_cond, format_list);
 
@@ -945,7 +946,7 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
 
 	print_fields_list = list_create(destroy_print_field);
 
-	memset(&cluster_cond, 0, sizeof(slurmdb_cluster_cond_t));
+	slurmdb_init_cluster_cond(&cluster_cond);
 
 	_set_wckey_cond(&i, argc, argv, wckey_cond, format_list);
 
@@ -1263,7 +1264,7 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
 
 	print_fields_list = list_create(destroy_print_field);
 
-	memset(&cluster_cond, 0, sizeof(slurmdb_cluster_cond_t));
+	slurmdb_init_cluster_cond(&cluster_cond);
 
 	_set_wckey_cond(&i, argc, argv, wckey_cond, format_list);