diff --git a/pimd/Makefile.am b/pimd/Makefile.am
index ef5cffa..70c5096 100644
--- a/pimd/Makefile.am
+++ b/pimd/Makefile.am
@@ -45,7 +45,11 @@
 INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" $(PIM_DEFS)
 INSTALL_SDATA=@INSTALL@ -m 600
-LIBS = @LIBS@ 
+LIBS = @LIBS@
+
+AM_CFLAGS = $(PICFLAGS)
+AM_LDFLAGS = $(PILDFLAGS)
+
 noinst_LIBRARIES = libpim.a
 sbin_PROGRAMS = pimd 
 bin_PROGRAMS = test_igmpv3_join
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index 51e5e36..64d7787 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -201,7 +201,6 @@
   memory_init();
   access_list_init();
   pim_init();
-  sort_node();
 
   /*
    * reset zlog default, then will obey configuration file
diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index 1b146f6..d1350b0 100644
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -24,6 +24,7 @@
 
 #include <zebra.h>
 #include "sigevent.h"
+#include "memory.h"
 #include "log.h"
 
 #include "pim_signals.h"
@@ -58,7 +59,7 @@
   zlog_rotate (NULL);
 }
 
-struct quagga_signal_t pimd_signals[] =
+static struct quagga_signal_t pimd_signals[] =
 {
   {
    .signal = SIGHUP,
@@ -80,6 +81,6 @@
 
 void pim_signals_init()
 {
-  signal_init(master, Q_SIGC(pimd_signals), pimd_signals);
+  signal_init(master, array_size(pimd_signals), pimd_signals);
 }