diff --git a/dbcon/mysql/mysql-Columnstore b/dbcon/mysql/mysql-Columnstore
index de090329f..02a0de162 100755
--- a/dbcon/mysql/mysql-Columnstore
+++ b/dbcon/mysql/mysql-Columnstore
@@ -61,7 +61,7 @@ datadir=$basedir/db
 # Value here is overriden by value in my.cnf. 
 # 0 means don't wait at all
 # Negative numbers mean to wait indefinitely
-service_startup_timeout=30
+service_startup_timeout=90
 
 # Lock directory for RedHat / SuSE.
 lockdir='/var/lock/subsys'
@@ -262,6 +262,8 @@ wait_for_gone () {
   done
 
   log_failure_msg
+  kill_by_pid
+
   return 1
 }
 
@@ -310,7 +312,7 @@ fi
 kill_by_pid() {
   # let's see if we can kill the 2 mysql procs by hand
   # get the our mysql from ps
-  eval $(ps -ef | grep "$COLUMNSTORE_INSTALL_DIR/mysql//bin/mysqld " | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
+  eval $(ps -ef | grep "$COLUMNSTORE_INSTALL_DIR/mysql/bin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
 
   if [ -n "$pid" ]; then
 	ppid=$(ps -o ppid= -p $pid)
@@ -369,6 +371,7 @@ case "$mode" in
         wait_for_gone $mysqld_pid "$mysqld_pid_file_path"; return_value=$?
       else
         log_failure_msg "MySQL server process #$mysqld_pid is not running!"
+        kill_by_pid
         rm "$mysqld_pid_file_path"
       fi
 
diff --git a/oam/install_scripts/binary_installer.sh b/oam/install_scripts/binary_installer.sh
index ead0dde37..280b10c22 100644
--- a/oam/install_scripts/binary_installer.sh
+++ b/oam/install_scripts/binary_installer.sh
@@ -238,11 +238,15 @@ send_user "\n"
 #
 # Start module installer to setup Customer OS files
 #
+if { $SERVERTYPE == "2" || $SERVERTYPE == "pmwithum" } { 
+    set MODULETYPE "um"
+}
+
 send_user "Run Module Installer                            "
 send " \n"
 send date\n
 send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/module_installer.sh --module=$MODULETYPE --port=$MYSQLPORT --installdir=$INSTALLDIR'\n"
-set timeout 60
+set timeout 120
 expect {
 	"word: " { send "$PASSWORD\n"
     exp_continue
@@ -256,54 +260,6 @@ expect {
 }
 send_user "\n"
 
-if { $MODULETYPE == "um" || $SERVERTYPE == "2" || $SERVERTYPE == "pmwithum" } { 
-	#
-	# run mysql setup scripts
-	#
-	send_user "Run MySQL Setup Scripts on Module               "
-	send " \n"
-	send date\n
-	send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/post-mysqld-install --installdir=$INSTALLDIR'\n"
-	set timeout 60
-	expect {
-		"word: " { send "$PASSWORD\n"
-	    exp_continue
-		}
-		"passphrase" { send "$PASSWORD\n" 
-	    exp_continue
-		}
-		"Exit status 0" { send_user "DONE" }
-		"Exit status 1" { send_user "ERROR: scp failed" ; exit 1 }
-		"ERROR" { send_user "ERROR: Daemon failed to run";
-		exit 1 }
-		"FAILED" { send_user "ERROR: Daemon failed to run";
-		exit 1 }
-		timeout { send_user "ERROR: Timeout\n" ; exit 2 }
-	}
-
-	send " \n"
-	send date\n
-	send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/post-mysql-install --installdir=$INSTALLDIR'\n"
-	set timeout 120
-	expect {
-		"word: " { send "$PASSWORD\n"
-	    exp_continue
-		}
-		"passphrase" { send "$PASSWORD\n" 
-	    exp_continue
-		}
-		"Exit status 0" { send_user "DONE" }
-		"Exit status 1" { send_user "ERROR: scp failed" ; exit 1 }
-		"ERROR" { send_user "ERROR: Daemon failed to run";
-		exit 1 }
-		"FAILED" { send_user "ERROR: Daemon failed to run";
-		exit 1 }
-		timeout { send_user "ERROR: Timeout\n" ; exit 2 }
-	}
-	send_user "\n"
-}
-
-
 send_user "\nInstallation Successfully Completed on '$MODULE'\n"
 exit 0
 
diff --git a/oam/install_scripts/user_installer.sh b/oam/install_scripts/user_installer.sh
index a31367aed..4d30492d8 100644
--- a/oam/install_scripts/user_installer.sh
+++ b/oam/install_scripts/user_installer.sh
@@ -255,7 +255,7 @@ send_user "\n"
 #
 send_user "Run Module Installer                            "
 send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/module_installer.sh --module=um --port=$MYSQLPORT'\n"
-set timeout 60
+set timeout 120
 expect {
 	"word: " { send "$PASSWORD\n"
     exp_continue