diff --git a/scripts/install b/scripts/install
index 24b51d3..1c083b8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -126,7 +126,7 @@ mv $final_path/$app/bin/* $final_path/.cargo/bin/
 chmod +x $final_path/.cargo/bin/*
 
 # Remove empty bin directory
-ynh_secure_remove --file="$final_path/$app/bin/"
+ynh_secure_remove --file="$final_path/$app/bin"
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
diff --git a/scripts/upgrade b/scripts/upgrade
index 6133991..1e08af7 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,6 +22,8 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_user=$db_name
+db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
 port=$(ynh_app_setting_get --app=$app --key=port)
 
 architecture=$(ynh_detect_arch)
@@ -113,7 +115,7 @@ then
 	chmod +x $final_path/.cargo/bin/*
 
 	# Remove empty bin directory
-	ynh_secure_remove --file="$final_path/$app/bin/"
+	ynh_secure_remove --file="$final_path/$app/bin"
 fi
 
 chmod 750 "$final_path"