diff --git a/asterixdb/asterix-events/src/main/resources/events/cc_failure/cc_failure.sh b/asterixdb/asterix-events/src/main/resources/events/cc_failure/cc_failure.sh
index 4663bba..e8bc326 100755
--- a/asterixdb/asterix-events/src/main/resources/events/cc_failure/cc_failure.sh
+++ b/asterixdb/asterix-events/src/main/resources/events/cc_failure/cc_failure.sh
@@ -17,8 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-CC_PARENT_ID_INFO=`ps -ef  | grep asterix | grep cc_start | grep -v ssh`
-CC_PARENT_ID=`echo $CC_PARENT_ID_INFO | tr -s " " | cut -d " " -f2`
-CC_ID_INFO=`ps -ef | grep asterix | grep $CC_PARENT_ID | grep -v bash`
-CC_ID=`echo $CC_ID_INFO |  tr -s " " | cut -d " " -f2`
+CC_PARENT_ID=`ps -ef  | grep asterix | grep cc_start | grep -v ssh | awk '{ print $2 }'`
+CC_ID=`ps -ef | grep asterix | grep $CC_PARENT_ID | grep -v bash | awk "\\\$3 == $CC_PARENT_ID { print \\\$2 }"`
 kill -9 $CC_ID
diff --git a/asterixdb/asterix-events/src/main/resources/events/node_failure/nc_failure.sh b/asterixdb/asterix-events/src/main/resources/events/node_failure/nc_failure.sh
index 9b0dcbb..50dfb26 100755
--- a/asterixdb/asterix-events/src/main/resources/events/node_failure/nc_failure.sh
+++ b/asterixdb/asterix-events/src/main/resources/events/node_failure/nc_failure.sh
@@ -19,16 +19,20 @@
 
 NC_ID=$1
 
-INFO=`ps -ef | grep nc_join | grep -v grep | grep -v ssh| grep $NC_ID | head -n 1`
-PARENT_ID=`echo  $INFO | cut -d " "  -f2`
-PID_INFO=`ps -ef |  grep asterix | grep -v grep | grep -v nc_join |  grep $PARENT_ID`
-PID=`echo $PID_INFO | cut -d " " -f2`
+PARENT_ID=`ps -ef | grep nc_join | grep -v grep | grep -v ssh| grep $NC_ID | head -n 1 | awk '{ print $2 }'`
+PID=`ps -ef |  grep asterix | awk "\\\$3 == $PARENT_ID { print \\\$2 }"`
 kill -15 $PID
 
-cmd_output=$(ps -ef | awk '{print $2}' |grep "^$PID$")
-while [ ${#cmd_output} -ne 0 ]
+cmd_output=$(ps -ef | awk "\\\$3 == $PID {print \\\$2}")
+tries=0
+while [ ${#cmd_output} -ne 0 -a $tries -lt 15 ]
 do
   sleep 1
   kill -15 $PID
-  cmd_output=$(ps -ef | awk '{print $2}' |grep "^$PID$")
+  tries=`expr $tries + 1`
+  cmd_output=$(ps -ef | awk "\\\$3 == $PID {print \\\$2}")
 done
+if [ ${#cmd_output} -ne 0 ];
+then
+  kill -9 $PID
+fi
\ No newline at end of file
diff --git a/asterixdb/asterix-events/src/main/resources/events/node_restart/nc_restart.sh b/asterixdb/asterix-events/src/main/resources/events/node_restart/nc_restart.sh
index 5ed2f7e..521b402 100755
--- a/asterixdb/asterix-events/src/main/resources/events/node_restart/nc_restart.sh
+++ b/asterixdb/asterix-events/src/main/resources/events/node_restart/nc_restart.sh
@@ -24,15 +24,15 @@
 if [ $NC_ID == 'ANY' ]
 then
   NC_ID="."
-  PARENT_ID=`ps -ej | tr -s " " | grep nc_join | grep -v grep | grep -v ssh |  cut -d " " -f2 | head -n 1`
+  PARENT_ID=`ps -ej | tr -s " " | grep nc_join | grep -v grep | grep -v ssh | awk '{ print $2 }' | head -n 1`
   PARENT_PROCESS_ENTRY=`ps -ef | grep $PARENT_ID | grep -v grep   | head -n 1`
   NC_ID=`echo ${PARENT_PROCESS_ENTRY##* }`
   echo "NCid is $NC_ID" >> ~/try.txt
 else
-  PARENT_ID=`ps -ej | tr -s " " | grep nc_join | grep -v grep | grep -v ssh | grep $NC_ID | cut -d " " -f2 | head -n 1`
+  PARENT_ID=`ps -ej | tr -s " " | grep nc_join | grep -v grep | grep -v ssh | grep $NC_ID | awk '{ print $2 }' | head -n 1`
 fi
 
-PID=`ps -ej | tr -s " " | grep hyracks | grep -v grep | grep -v nc_join |  grep $PARENT_ID | cut -d " " -f2 | head -n 1`
+PID=`ps -ej | tr -s " " | grep hyracks | grep -v grep | grep -v nc_join | awk "\\\$3 == $PARENT_ID { print \\\$2 }" | head -n 1`
 kill -9 $PID
 
 sleep $3
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 310e346..0ab040b 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -225,6 +225,9 @@
             <licenseFamily implementation="org.apache.rat.license.Apache20LicenseFamily"/>
           </licenseFamilies>
           <excludeSubProjects>true</excludeSubProjects>
+          <excludes combine.children="append">
+            <exclude>**/*.iml</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>