diff --git a/oam/install_scripts/columnstore.def b/oam/install_scripts/columnstore.def
index 68c0eda73..1a12f57d7 100644
--- a/oam/install_scripts/columnstore.def
+++ b/oam/install_scripts/columnstore.def
@@ -4,6 +4,6 @@
 # Change this line to your MariaDB Columnstore installation directory
 COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
 
-LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql
+LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install
index 69dfb5822..8cbe81d57 100755
--- a/oam/install_scripts/post-install
+++ b/oam/install_scripts/post-install
@@ -39,7 +39,7 @@ done
  
 if [ $user != "root" ]; then
 	export COLUMNSTORE_INSTALL_DIR=$installdir
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
 else
 	# add library config file
 	/bin/cp -f $installdir/bin/columnstore.conf /etc/ld.so.conf.d/. >/dev/null 2>&1
@@ -274,7 +274,7 @@ cat <<EOD
 The next steps are:
 
 export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
 $installdir/bin/postConfigure -i $installdir
 
 EOD
@@ -305,14 +305,14 @@ cat <<EOD
 If you are intending to install MariaDB Columnstore over Hadoop, the next steps are:
 
 export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
 . $installdir/bin/setenv-hdfs-20
 $installdir/bin/postConfigure -i $installdir
 
 If you are intending to install MariaDB Columnstore without Hadoop, the next steps are:
 
 export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
 $installdir/bin/postConfigure -i $installdir
 
 EOD
@@ -344,14 +344,14 @@ cat <<EOD
 If you are intending to install MariaDB Columnstore over Hadoop, the next steps are:
 
 export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql:$libpath
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib:$libpath
 . $installdir/bin/setenv-hdfs-12
 $installdir/bin/postConfigure -i $installdir
 
 If you are intending to install MariaDB Columnstore without Hadoop, the next steps are:
 
 export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
 $installdir/bin/postConfigure -i $installdir
 
 EOD
diff --git a/oam/install_scripts/pre-uninstall b/oam/install_scripts/pre-uninstall
index 8709d369c..6095fed3d 100755
--- a/oam/install_scripts/pre-uninstall
+++ b/oam/install_scripts/pre-uninstall
@@ -164,10 +164,11 @@ else
 fi
 
 #remove library paths
-if [ $installdir == "/usr/local/mariadb/columnstore" ]; then
-        # remove library config file
-        $SUDO rm -f /etc/ld.so.conf.d/columnstore.conf
-        $SUDO ldconfig
+if [ $user = "root" ]; then
+        rm -f /etc/ld.so.conf.d/columnstore.conf
+        ldconfig
+else
+	$SUDO rm -f /etc/defaults/columnstore
 fi
 
 #cleanup .bashrc