diff --git a/pregelix/pregelix-core/src/main/resources/scripts/startCluster.sh b/pregelix/pregelix-core/src/main/resources/scripts/startCluster.sh
index bc1e7c4..a0c2063 100644
--- a/pregelix/pregelix-core/src/main/resources/scripts/startCluster.sh
+++ b/pregelix/pregelix-core/src/main/resources/scripts/startCluster.sh
@@ -1,3 +1,3 @@
 bin/startcc.sh
-sleep 10
+sleep 5
 bin/startAllNCs.sh
diff --git a/pregelix/pregelix-core/src/main/resources/scripts/stopCluster.sh b/pregelix/pregelix-core/src/main/resources/scripts/stopCluster.sh
index a8c8a0a..4889934 100644
--- a/pregelix/pregelix-core/src/main/resources/scripts/stopCluster.sh
+++ b/pregelix/pregelix-core/src/main/resources/scripts/stopCluster.sh
@@ -1,3 +1,3 @@
 bin/stopAllNCs.sh
-sleep 10
+sleep 2
 bin/stopcc.sh
diff --git a/pregelix/pregelix-core/src/main/resources/scripts/stopnc.sh b/pregelix/pregelix-core/src/main/resources/scripts/stopnc.sh
index f3c47a9..021071a 100644
--- a/pregelix/pregelix-core/src/main/resources/scripts/stopnc.sh
+++ b/pregelix/pregelix-core/src/main/resources/scripts/stopnc.sh
@@ -3,6 +3,12 @@
 
 #Kill process
 PID=`ps -ef|grep ${USER}|grep java|grep hyracks|awk '{print $2}'`
+
+if [ "$PID" == "" ]; then
+  USERID=`id | sed 's/^uid=//;s/(.*$//'`
+  PID=`ps -ef|grep ${USERID}|grep java|grep hyracks|awk '{print $2}'`
+fi
+
 echo $PID
 kill -9 $PID
 
@@ -14,4 +20,4 @@
 done
 
 #Clean up NC temp dir
-rm -rf $NCTMP_DIR/*
\ No newline at end of file
+rm -rf $NCTMP_DIR/*