diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 758ad606..0a75e3c8 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -647,8 +647,10 @@ namespace TShockAPI
 
 		private void SetConsoleTitle()
 		{
-			Console.Title = string.Format("{0} - {1}/{2} @ {3}:{4} (TerrariaShock v{5})", Config.ServerName, Utils.ActivePlayers(),
-								  Config.MaxSlots, Netplay.serverListenIP, Netplay.serverPort, Version);
+		    Console.Title = string.Format("{0}{1}/{2} @ {3}:{4} (TerrariaShock v{5})",
+		                                  !string.IsNullOrWhiteSpace(Config.ServerName) ? Config.ServerName + " - " : "",
+		                                  Utils.ActivePlayers(),
+		                                  Config.MaxSlots, Netplay.serverListenIP, Netplay.serverPort, Version);
 		}
 
         private void OnHardUpdate( HardUpdateEventArgs args )
diff --git a/TShockAPI/postbuild.bat b/TShockAPI/postbuild.bat
index 1ecae508..dda05b70 100644
--- a/TShockAPI/postbuild.bat
+++ b/TShockAPI/postbuild.bat
@@ -1,4 +1,4 @@
-set pluginspath=C:\Program Files (x86)\Steam\steamapps\common\terraria\serverplugins\
+set pluginspath=F:\Program Files (x86)\Steam\steamapps\common\terraria\serverplugins\
 IF NOT EXIST "%pluginspath%" GOTO SkipCopy
 attrib -r "%pluginspath%TShockAPI.dll"
 attrib -r "%pluginspath%TShockAPI.pdb"