diff --git a/dbcon/mysql/my.cnf b/dbcon/mysql/my.cnf
index 72a442e41..569bb7fd9 100644
--- a/dbcon/mysql/my.cnf
+++ b/dbcon/mysql/my.cnf
@@ -63,8 +63,8 @@ infinidb_use_import_for_batchinsert=1
 infinidb_import_for_batchinsert_delimiter=7
 
 basedir                         = /usr/local/mariadb/columnstore/mysql/
-character-sets-dir              = /usr/local/mariadb/columnstore/mysql/share/charsets/
-language                        = /usr/local/mariadb/columnstore/mysql/share/english/
+character-sets-dir              = /usr/local/mariadb/columnstore/mysql/share/mysql/charsets/
+language                        = /usr/local/mariadb/columnstore/mysql/share/mysql/english/
 plugin_dir                      = /usr/local/mariadb/columnstore/mysql/lib/plugin
 
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
diff --git a/oam/install_scripts/post-mysqld-install b/oam/install_scripts/post-mysqld-install
index 8193edbbf..c779f966d 100755
--- a/oam/install_scripts/post-mysqld-install
+++ b/oam/install_scripts/post-mysqld-install
@@ -68,7 +68,7 @@ fi
 test -x /usr/local/bin/idb-testing-mysql-pre-start && /usr/local/bin/idb-testing-mysql-pre-start $installdir/mysql
 
 ### Don't give the user the notes, we'll fix them ourselves...
-$installdir/mysql/scripts/mysql_install_db --rpm --user=$user --defaults-file=$installdir/mysql/my.cnf --basedir=$installdir/mysql >/dev/null
+$installdir/mysql/bin/mysql_install_db --rpm --user=$user --defaults-file=$installdir/mysql/my.cnf --basedir=$installdir/mysql >/dev/null
 # Change permissions again to fix any new files.
 chown -R $user:$user $mysql_datadir