diff --git a/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c b/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c
index 154b39b67d7b340bf6e0a60933dd8f4888075480..a9d0f7470d6fdc6ff776405baebf2b4e6eaa2a7b 100644
--- a/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c
+++ b/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c
@@ -1407,8 +1407,7 @@ extern void filetxt_jobacct_process_archive(List selected_parts,
 	fflush(new_logfile);	/* Flush the buffers before forking */
 	fflush(fd);
 
-	file_err = reconfigure_slurmctld();
-	
+	file_err = slurm_reconfigure();
 	if (file_err) {
 		file_err = 1;
 		fprintf(stderr, "Error: Attempt to reconfigure "
diff --git a/src/sacct/options.c b/src/sacct/options.c
index e794eee893092bbe638af529eb88cb6d517dad92..ec86d09583914cc5725c5623373b60ba4b31d9ea 100644
--- a/src/sacct/options.c
+++ b/src/sacct/options.c
@@ -1064,8 +1064,13 @@ void do_dump_completion(void)
 /* do_expire() -- purge expired data from the accounting log file
  */
 
-void do_expire(void)
+void do_expire(int dummy)
 {
+	if (dummy == NO_VAL) {
+		/* just load the symbol, don't want to execute */
+		slurm_reconfigure();
+	}
+
 	if(params.opt_completion) 
 		g_slurm_jobcomp_archive(selected_parts, &params);
 	else
diff --git a/src/sacct/sacct.c b/src/sacct/sacct.c
index 20f854b2325495d91bdfacad96e2020da3c4e2e0..cec42997f3521dbc51942d9b445a609016104d00 100644
--- a/src/sacct/sacct.c
+++ b/src/sacct/sacct.c
@@ -291,7 +291,7 @@ int main(int argc, char **argv)
 			do_dump();
 		break;
 	case SACCT_EXPIRE:
-		do_expire();
+		do_expire(0);
 		break;
 	case SACCT_FDUMP:
 		if(get_data() == SLURM_ERROR)
diff --git a/src/sacct/sacct.h b/src/sacct/sacct.h
index 2d16a2fcc090f037f7ee15df2b225f61d489cacb..c340bc9eeaa06877c1d729ebc2674e00a3d486a6 100644
--- a/src/sacct/sacct.h
+++ b/src/sacct/sacct.h
@@ -159,7 +159,7 @@ int get_data(void);
 void parse_command_line(int argc, char **argv);
 void do_dump(void);
 void do_dump_completion(void);
-void do_expire(void);
+void do_expire(int dummy);
 void do_help(void);
 void do_list(void);
 void do_list_completion(void);
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index b54dde06f7fb15715ed1f8bb3f257f27a43850b3..65daf2715f2f0b33de4bc7d6d5fc88b0ae10e3b0 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -552,8 +552,9 @@ static void  _init_config(void)
 #endif
 }
 
-/* Read configuration file */
-extern int reconfigure_slurmctld(void)
+/* Read configuration file.
+ * Same name as API function for use in accounting_storage plugin */
+extern int slurm_reconfigure(void)
 {
 	/* Locks: Write configuration, job, node, and partition */
 	slurmctld_lock_t config_write_lock = { 
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index 5f25719fe3bb91b138c22eba43318d659def6ae8..6119e1e007d143b8e01f30b23a1b758a9cfcf42f 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -1210,9 +1210,6 @@ void part_fini (void);
  */
 extern void purge_old_job (void);
 
-/* Read configuration file */
-extern int reconfigure_slurmctld(void);
-
 /*
  * rehash_jobs - Create or rebuild the job hash table.
  * NOTE: run lock_slurmctld before entry: Read config, write job
@@ -1283,6 +1280,10 @@ extern void set_slurmd_addr (void);
  */
 extern void signal_step_tasks(struct step_record *step_ptr, uint16_t signal);
 
+/* Read configuration file.
+ * Same name as API function for use in accounting_storage plugin */
+extern int slurm_reconfigure(void);
+
 /*
  * slurmctld_shutdown - wake up slurm_rpc_mgr thread via signal
  * RET 0 or error code
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index 09927732541ff63242316d2b42e272b1da46c28b..7a8e917ea8369a0994b163bb0882a2d0f57d2dc1 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -81,6 +81,8 @@ static hostlist_t _step_range_to_hostlist(struct step_record *step_ptr,
 static int _step_hostname_to_inx(struct step_record *step_ptr,
 				char *node_name);
 static void _step_dealloc_lps(struct step_record *step_ptr);
+
+
 /* 
  * create_step_record - create an empty step_record for the specified job.
  * IN job_ptr - pointer to job table entry to have step record added
@@ -98,7 +100,7 @@ create_step_record (struct job_record *job_ptr)
 	last_job_update = time(NULL);
 	step_ptr->job_ptr = job_ptr; 
 	step_ptr->step_id = (job_ptr->next_step_id)++;
-	step_ptr->start_time = time ( NULL ) ;
+	step_ptr->start_time = time(NULL) ;
 	step_ptr->jobacct = jobacct_gather_g_create(NULL);
 	step_ptr->ckpt_path = NULL;
 	if (list_append (job_ptr->step_list, step_ptr) == NULL)