diff --git a/scripts/restore b/scripts/restore
index eb6a985..27f6844 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -28,7 +28,7 @@ ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./d
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50
+ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=5
 
 # Restore the file first, so it can have a backup if different
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
diff --git a/scripts/upgrade b/scripts/upgrade
index e945414..3d43349 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -119,16 +119,16 @@ exec_occ() {
 mysql_db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 if [ -n "$mysql_db_pwd" ]
 then
-    ynh_script_progression --message="Migrate Database..."
+    ynh_script_progression --message="Migrating to PostgreSQL database..."
 
     ynh_backup_if_checksum_is_different --file="$install_dir/config/config.php"
 
     ynh_psql_test_if_first_run
-    ynh_psql_setup_db --db_user=$db_name --db_name=$db_name
+    ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
 
     exec_occ db:convert-type --all-apps --clear-schema pgsql $db_name 127.0.0.1 $db_name --password=$db_pwd -n
 
-    ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name
+    ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
     ynh_app_setting_delete --app=$app --key=mysqlpwd
 
     ynh_store_file_checksum --file="${install_dir}/config/config.php"