diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index f3ac9ea..15fff34 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -778,14 +778,6 @@
     break;
   }
 
-  /* Performance hack. Send hello immideately when some neighbor enter
-     Init state.  This whay we decrease neighbor discovery time. Gleb.*/
-  if (state == NSM_Init)
-    {
-      OSPF_ISM_TIMER_OFF (oi->t_hello);
-      OSPF_ISM_TIMER_MSEC_ON (oi->t_hello, ospf_hello_timer, 1);
-    }
-
   /* Preserve old status? */
 }
 
diff --git a/solaris/quagga.init.in b/solaris/quagga.init.in
index 8b298c3..8457e99 100755
--- a/solaris/quagga.init.in
+++ b/solaris/quagga.init.in
@@ -281,7 +281,7 @@
 	eval exec $DAEMON_PATH/$DAEMON $DAEMON_ARGS --pid_file ${PIDFILE} &
 }
 
-stop () {
+stop_by_pidfile () {
 	if [ -f "${PIDFILE}" ]; then
 		/usr/bin/kill -TERM `/usr/bin/cat "${PIDFILE}"`
 	fi
@@ -292,7 +292,7 @@
 	start
 	;;
 'stop')
-	stop
+	stop_by_pidfile
 	;;
 
 *)