diff --git a/mcp/corosync.c b/mcp/corosync.c
index 07d7490..a4f6b34 100644
--- a/mcp/corosync.c
+++ b/mcp/corosync.c
@@ -50,7 +50,6 @@ static struct cpg_name cpg_group = {
 gboolean use_cman = FALSE;
 static cpg_handle_t cpg_handle;
 static corosync_cfg_handle_t cfg_handle;
-static corosync_cfg_state_notification_t cfg_buffer;
 
 /* =::=::=::= CFG - Shutdown stuff =::=::=::= */
 
@@ -143,14 +142,6 @@ cluster_connect_cfg(uint32_t * nodeid)
 
     crm_debug("Our nodeid: %d", *nodeid);
 
-    retries = 0;
-    cs_repeat(retries, 30, rc = corosync_cfg_state_track(cfg_handle, 0, &cfg_buffer));
-
-    if (rc != CS_OK) {
-        crm_err("corosync cfg stack_track error %d", rc);
-        goto bail;
-    }
-
     crm_debug("Adding fd=%d to mainloop", fd);
     G_main_add_fd(G_PRIORITY_HIGH, fd, FALSE, pcmk_cfg_dispatch, &cfg_handle,
                   cfg_connection_destroy);
diff --git a/tools/report.collector b/tools/report.collector
index 20203f6..4fdac3e 100644
--- a/tools/report.collector
+++ b/tools/report.collector
@@ -700,10 +700,9 @@ for l in $logfiles $EXTRA_LOGS; do
     node_events `basename $l` > $EVENTS_F
 
     # Link the first logfile to a standard name if it doesn't yet exist
-    if [ -e $HALOG_F ]; then
-        : nothing
-    else
-	ln -s `basename $l` $HALOG_F 
+    f=`basename $l`
+    if [ -e $f -a ! -e $HALOG_F ]; then
+	ln -s $f $HALOG_F 
     fi
 done