diff --git a/init.d/openstack-neat-data-collector b/init.d/openstack-neat-data-collector
index 9a09d66..9aee7e8 100755
--- a/init.d/openstack-neat-data-collector
+++ b/init.d/openstack-neat-data-collector
@@ -40,8 +40,6 @@ start() {
     mkdir -p $piddir
     daemon --user root --pidfile $pidfile "$exec &>/dev/null & echo \$! > $pidfile"
     retval=$?
-    echo $pidfile
-    cat $pidfile
     echo
     [ $retval -eq 0 ] && touch $lockfile
     return $retval
diff --git a/init.d/openstack-neat-global-manager b/init.d/openstack-neat-global-manager
index 9dbdd6f..64d251a 100755
--- a/init.d/openstack-neat-global-manager
+++ b/init.d/openstack-neat-global-manager
@@ -26,7 +26,8 @@
 suffix=global-manager
 prog=openstack-neat-$suffix
 exec="/usr/bin/neat-$suffix"
-pidfile="/var/run/neat/neat-$suffix.pid"
+piddir="/var/run/neat"
+pidfile="$piddir/neat-$suffix.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -36,6 +37,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
+    mkdir -p $piddir
     daemon --user root --pidfile $pidfile "$exec &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
diff --git a/init.d/openstack-neat-local-manager b/init.d/openstack-neat-local-manager
index 135fe19..19e2d9a 100755
--- a/init.d/openstack-neat-local-manager
+++ b/init.d/openstack-neat-local-manager
@@ -28,7 +28,8 @@
 suffix=local-manager
 prog=openstack-neat-$suffix
 exec="/usr/bin/neat-$suffix"
-pidfile="/var/run/neat/neat-$suffix.pid"
+piddir="/var/run/neat"
+pidfile="$piddir/neat-$suffix.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -38,6 +39,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
+    mkdir -p $piddir
     daemon --user root --pidfile $pidfile "$exec &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo