diff --git a/app/local.py b/app/local.py
index 2f4f0acd..9c435885 100644
--- a/app/local.py
+++ b/app/local.py
@@ -99,9 +99,9 @@ def update_env_file(env_file: pathlib.Path, port: int) -> None:
 
 
 def main():
-    parser = argparse.ArgumentParser(description="Start YTPTube server")
+    parser = argparse.ArgumentParser(description="Start YTPTube server", allow_abbrev=False)
     parser.add_argument("--no-browser", action="store_true", help="Do not open browser on start")
-    args = parser.parse_args()
+    args, _ = parser.parse_known_args()
 
     set_env()
 
@@ -130,4 +130,7 @@ def main():
 
 
 if __name__ == "__main__":
+    from multiprocessing import freeze_support
+
+    freeze_support()
     main()
diff --git a/app/routes/api/system.py b/app/routes/api/system.py
index 5564ea40..84a510c1 100644
--- a/app/routes/api/system.py
+++ b/app/routes/api/system.py
@@ -50,6 +50,7 @@ async def shutdown_system(request: Request, config: Config, encoder: Encoder, no
 
     # Schedule shutdown after response
     asyncio.create_task(do_shutdown())
+    LOG.info("Shutdown initiated by user request. Stopping the server...")
     return web.json_response(
         data={
             "message": "The application shutting down.",