diff --git a/check_process b/check_process
index 8c41893..8ceb142 100644
--- a/check_process
+++ b/check_process
@@ -7,7 +7,7 @@
 		mumbleweb=1
 	; Checks
 		pkg_linter=1
-		setup_sub_dir=1
+		setup_sub_dir=0
 		setup_root=1
 		setup_nourl=1
 		setup_private=1
diff --git a/scripts/install b/scripts/install
index d01e921..6877228 100644
--- a/scripts/install
+++ b/scripts/install
@@ -83,7 +83,7 @@ if [ "$mumbleweb" -eq 1 ] ; then
     port_web=$(ynh_find_port --port=64737)
     ynh_app_setting_set --app=$app --key=port_web --value=$port_web
     # Open port in firewall
-    ynh_exec_warn_less yunohost firewall allow Both $port_web
+    #ynh_exec_warn_less yunohost firewall allow Both $port_web
 fi
 
 #=================================================
@@ -197,7 +197,7 @@ ynh_script_progression --message="Integrating service in YunoHost..."
 # Add Mumble as a YunoHost service
 yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports=$port
 # Add Mumble as a YunoHost service
-yunohost service add mumble-web --description="Mumble web" --log="/var/log/$app/mumble-web.log" --needs_exposed_ports=$port_web
+yunohost service add mumble-web --description="Mumble web" --log="/var/log/$app/mumble-web.log"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/remove b/scripts/remove
index 96acc80..b49c08f 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -43,7 +43,7 @@ ynh_script_progression --message="Stopping and removing the systemd service..."
 
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
-ynh_remove_systemd_config mumble-web
+ynh_remove_systemd_config --service=mumble-web
 
 #=================================================
 # REMOVE DEPENDENCIES
@@ -52,11 +52,7 @@ ynh_script_progression --message="Removing dependencies..." --weight=1
 
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
-
-#=================================================
-# REMOVE NODEJS
-#=================================================
-
+# Remove NodeJS
 ynh_remove_nodejs
 
 #=================================================
@@ -85,13 +81,13 @@ then
 	ynh_exec_warn_less yunohost firewall disallow Both $port
 fi
 
-if [ "$mumbleweb" -eq 1 ] ; then
-    if yunohost firewall list | grep -q "\- $port_web$"
-    then
-        echo "Close port $port_web"
-        yunohost firewall disallow Both "$port_web" > /dev/null 2>&1
-    fi
-fi
+# if [ "$mumbleweb" -eq 1 ] ; then
+#     if yunohost firewall list | grep -q "\- $port_web$"
+#     then
+#         echo "Close port $port_web"
+#         yunohost firewall disallow Both "$port_web" > /dev/null 2>&1
+#     fi
+# fi
 
 #=================================================
 # SPECIFIC REMOVE
diff --git a/scripts/restore b/scripts/restore
index ee2ab92..a531bee 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -102,7 +102,7 @@ ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 # Add Mumble as a YunoHost service
 yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports=$port
 # Add Mumble as a YunoHost service
-yunohost service add mumble-web --description="Mumble web" --log="/var/log/$app/mumble-web.log" --needs_exposed_ports=$port_web
+yunohost service add mumble-web --description="Mumble web" --log="/var/log/$app/mumble-web.log"
 
 #=================================================
 # RESTORE SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index 185d57d..3cf9352 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -140,11 +140,10 @@ ynh_system_user_create --username="$app" --home_dir="$final_path"
 #=================================================
 
 if [ "$mumbleweb" -eq 1 ] ; then
-then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path"
+	ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/mumble-server.ini"
 fi
 
 #=================================================
@@ -169,7 +168,7 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 # mumble server conf.ini
 #=================================================
 
-mkdir -p $final_path
+#mkdir -p $final_path
 ynh_add_config --template="../conf/mumble-server.ini" --destination="$final_path/mumble-server.ini"
 
 #=================================================
@@ -222,7 +221,7 @@ systemctl disable mumble-server --quiet
 # Add Mumble as a YunoHost service
 yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports=$port
 # Add Mumble as a YunoHost service
-yunohost service add mumble-web --description="Mumble web" --log="/var/log/$app/mumble-web.log" --needs_exposed_ports=$port_web
+yunohost service add mumble-web --description="Mumble web" --log="/var/log/$app/mumble-web.log"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -244,7 +243,7 @@ ynh_systemd_action --service_name=nginx --action=reload
 #=================================================
 
 message="
-Mumbleserver was updated!
+Mumble-server was updated!
 
 Port                   : $port
 Password to join server: $server_password