diff --git a/OneClickDeploy.cmd b/OneClickDeploy.cmd
index bcd2ad8..d91654d 100644
--- a/OneClickDeploy.cmd
+++ b/OneClickDeploy.cmd
@@ -333,7 +333,7 @@ echo Using MongoDB Data Directory: %DatabasePath%
 
 if %ARG_MAX%==0 (
     set "LaunchDatabase=1"
-    set "LaunchIrc=%hasIrc%"
+    set "LaunchIrc=1"
     set "LaunchServer=1"
 ) else (
     set "LaunchDatabase=0"
@@ -347,21 +347,9 @@ if %ARG_MAX%==0 (
 )
 
 echo Launching:
-if %LaunchDatabase%==1 (
-    echo - Database
-) else (
-    echo - Database [skipped]
-)
-if %LaunchIrc%==1 (
-    echo - IRC
-) else (
-    echo - IRC [skipped]
-)
-if %LaunchServer%==1 (
-    echo - Server
-) else (
-    echo - Server [skipped]
-)
+echo - Launch Database [%LaunchDatabase%]
+echo - Launch IRC [%LaunchIrc%]
+echo - Launch Server [%LaunchServer%]
 
 if not exist "%ExternalDir%" mkdir "%ExternalDir%"
 if %LaunchDatabase%==1 call :ensure-mongodb
@@ -399,7 +387,7 @@ if %LaunchDatabase%==1 (
         mkdir "%DatabasePath%"
         call :assert "Failed to create MongoDB data directory %DatabasePath%"
     )
-    set "WT_CMD= ; %WT_CMD_DATABASE%"
+    set "WT_CMD=%WT_CMD% ; %WT_CMD_DATABASE%"
 )
 if %LaunchIrc%==1 set "WT_CMD=%WT_CMD% ; %WT_CMD_IRC%"
 if "!WT_CMD:~0,2!"==" ;" set "WT_CMD=!WT_CMD:~2!"