diff --git a/tools/do_concolic.sh b/tools/do_concolic.sh
index 0535e86a9252f6e7c44f151702161eb822a6850b..23195bc2735c2c60b747c6d6fd90d90948a8d943 100755
--- a/tools/do_concolic.sh
+++ b/tools/do_concolic.sh
@@ -38,7 +38,7 @@ if [ ! -f $sym ]; then
 fi
 
 
-echo STRATA_GRACE=1 $GRACE_HOME/concolic/src/util/linux/run $extra_args  -s $sym $strata_exe
+echo STRATA_GRACE=1 $GRACE_HOME/concolic/bin/pgrp-timeout $GRACE_TIMEOUT_VALUE $GRACE_HOME/concolic/src/util/linux/run $extra_args  -s $sym $strata_exe
      STRATA_GRACE=1 $GRACE_HOME/concolic/bin/pgrp-timeout $GRACE_TIMEOUT_VALUE $GRACE_HOME/concolic/src/util/linux/run $extra_args  -s $sym $strata_exe
 
 
diff --git a/tools/ps_analyze.sh b/tools/ps_analyze.sh
index 71656bc0b09bcb4bcdea622eb3ae345dbbebea4a..3ff1cce66a7cfe2af22034edb094be455879f024 100755
--- a/tools/ps_analyze.sh
+++ b/tools/ps_analyze.sh
@@ -336,18 +336,23 @@ check_files()
 
 }
 
-check_for_iconv()
+check_for_bad_funcs()
 {
 	my_name=$1
-	nm $my_name|grep iconv_open  > /dev/null 2> /dev/null 
+	bad_funcs="htons ntohs ntohl htonl iconv_open"
+
+	for ducs_i in $bad_funcs
+	do
+		nm $my_name|grep $ducs_i  > /dev/null 2> /dev/null 
 	
-	if [ $? = 0 ]; then
-		echo Found iconv in executable, we should skip this test.
-		echo SKIP
-		echo Skip
-		echo skip
-		exit 255
-	fi
+		if [ $? = 0 ]; then
+			echo "Found bad function ($ducs_i) in executable, we should skip this test."
+			echo SKIP
+			echo Skip
+			echo skip
+			exit 255
+		fi
+	done
 }
 
 #
@@ -440,7 +445,7 @@ rm -f $stratafied_exe
 # and switch to that dir
 cd $newdir
 
-check_for_iconv $newname.ncexe
+check_for_bad_funcs $newname.ncexe
 
 # next, create a location for our log files
 mkdir logs 	
diff --git a/tools/ps_run.sh b/tools/ps_run.sh
index dea4b8c6cadb4044c7099a63f2b7cf21c9d48d74..a64497e6ffaff43acaef0913b3cf708bee5caec2 100755
--- a/tools/ps_run.sh
+++ b/tools/ps_run.sh
@@ -94,4 +94,8 @@ if [ -f $datapath/diagnostics.out ]; then
 	fi
 fi
 
+# final check, in case we couldn't catch the signal
+if [ $SAVE_EXIT_CODE = 139 ]; then
+	exit 200
+fi
 exit $SAVE_EXIT_CODE