diff --git a/src/plugins/select/bluegene/plugin/Makefile.am b/src/plugins/select/bluegene/plugin/Makefile.am
index 5855e32d4472c86d56ce16f008d11f9244d5bc76..378a4698704dccde1de707d75d7d78a8b2f03dbf 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.am
+++ b/src/plugins/select/bluegene/plugin/Makefile.am
@@ -40,9 +40,12 @@ libsched_if64_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
 
 sbin_PROGRAMS = slurm_prolog slurm_epilog sfree
 
-sfree_LDADD = $(top_builddir)/src/api/libslurmhelper.la
-slurm_prolog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
-slurm_epilog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
+convenience_libs = \
+	$(top_builddir)/src/api/libslurm.o -ldl
+
+sfree_LDADD = $(convenience_libs)
+slurm_prolog_LDADD = $(convenience_libs)
+slurm_epilog_LDADD = $(convenience_libs)
 sfree_SOURCES = sfree.c sfree.h opts.c \
 		../block_allocator/bridge_linker.c \
 		../block_allocator/bridge_linker.h
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index bdfcff02f294b29a55d09dbb8262cba2812d348e..dfa3b644b0a5e87e251948154c4d9e10e5dc813a 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -150,7 +150,9 @@ am__sfree_SOURCES_DIST = sfree.c sfree.h opts.c \
 @BLUEGENE_LOADED_TRUE@am_sfree_OBJECTS = sfree.$(OBJEXT) \
 @BLUEGENE_LOADED_TRUE@	opts.$(OBJEXT) bridge_linker.$(OBJEXT)
 sfree_OBJECTS = $(am_sfree_OBJECTS)
-@BLUEGENE_LOADED_TRUE@sfree_DEPENDENCIES = $(top_builddir)/src/api/libslurmhelper.la
+@BLUEGENE_LOADED_TRUE@am__DEPENDENCIES_1 =  \
+@BLUEGENE_LOADED_TRUE@	$(top_builddir)/src/api/libslurm.o
+@BLUEGENE_LOADED_TRUE@sfree_DEPENDENCIES = $(am__DEPENDENCIES_1)
 sfree_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sfree_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -158,7 +160,8 @@ am__slurm_epilog_SOURCES_DIST = slurm_epilog.c
 @BLUEGENE_LOADED_TRUE@am_slurm_epilog_OBJECTS =  \
 @BLUEGENE_LOADED_TRUE@	slurm_epilog.$(OBJEXT)
 slurm_epilog_OBJECTS = $(am_slurm_epilog_OBJECTS)
-@BLUEGENE_LOADED_TRUE@slurm_epilog_DEPENDENCIES = $(top_builddir)/src/api/libslurmhelper.la
+@BLUEGENE_LOADED_TRUE@slurm_epilog_DEPENDENCIES =  \
+@BLUEGENE_LOADED_TRUE@	$(am__DEPENDENCIES_1)
 slurm_epilog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(slurm_epilog_LDFLAGS) $(LDFLAGS) -o $@
@@ -166,7 +169,8 @@ am__slurm_prolog_SOURCES_DIST = slurm_prolog.c
 @BLUEGENE_LOADED_TRUE@am_slurm_prolog_OBJECTS =  \
 @BLUEGENE_LOADED_TRUE@	slurm_prolog.$(OBJEXT)
 slurm_prolog_OBJECTS = $(am_slurm_prolog_OBJECTS)
-@BLUEGENE_LOADED_TRUE@slurm_prolog_DEPENDENCIES = $(top_builddir)/src/api/libslurmhelper.la
+@BLUEGENE_LOADED_TRUE@slurm_prolog_DEPENDENCIES =  \
+@BLUEGENE_LOADED_TRUE@	$(am__DEPENDENCIES_1)
 slurm_prolog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(slurm_prolog_LDFLAGS) $(LDFLAGS) -o $@
@@ -406,9 +410,12 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(BG_INCLUDES)
 # MPIRUN dynamic lib.
 @BLUEGENE_LOADED_TRUE@libsched_if64_la_SOURCES = libsched_if64.c
 @BLUEGENE_LOADED_TRUE@libsched_if64_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-@BLUEGENE_LOADED_TRUE@sfree_LDADD = $(top_builddir)/src/api/libslurmhelper.la
-@BLUEGENE_LOADED_TRUE@slurm_prolog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
-@BLUEGENE_LOADED_TRUE@slurm_epilog_LDADD = $(top_builddir)/src/api/libslurmhelper.la
+@BLUEGENE_LOADED_TRUE@convenience_libs = \
+@BLUEGENE_LOADED_TRUE@	$(top_builddir)/src/api/libslurm.o -ldl
+
+@BLUEGENE_LOADED_TRUE@sfree_LDADD = $(convenience_libs)
+@BLUEGENE_LOADED_TRUE@slurm_prolog_LDADD = $(convenience_libs)
+@BLUEGENE_LOADED_TRUE@slurm_epilog_LDADD = $(convenience_libs)
 @BLUEGENE_LOADED_TRUE@sfree_SOURCES = sfree.c sfree.h opts.c \
 @BLUEGENE_LOADED_TRUE@		../block_allocator/bridge_linker.c \
 @BLUEGENE_LOADED_TRUE@		../block_allocator/bridge_linker.h
diff --git a/src/plugins/select/bluegene/plugin/bg_record_functions.c b/src/plugins/select/bluegene/plugin/bg_record_functions.c
index 3fd331d39710d9ee960016f3917c4d7632c64472..45687e0ccf669b4a216c40c86fe22caac7094204 100644
--- a/src/plugins/select/bluegene/plugin/bg_record_functions.c
+++ b/src/plugins/select/bluegene/plugin/bg_record_functions.c
@@ -1541,14 +1541,12 @@ static int _check_all_blocks_error(int node_inx, time_t event_time,
 			reason = "update block: setting partial node down.";
 		send_node.node_state = NODE_STATE_ERROR;
 		rc = clusteracct_storage_g_node_down(acct_db_conn,
-						     slurmctld_cluster_name,
 						     &send_node, event_time,
 						     reason,
 						     slurm_get_slurm_user_id());
 	} else {
 		send_node.node_state = NODE_STATE_IDLE;
 		rc = clusteracct_storage_g_node_up(acct_db_conn,
-						   slurmctld_cluster_name,
 						   &send_node, event_time);
 	}