3 files changed, 6 insertions, 4 deletions
diff --git a/src/zenserver/compute/computeserver.cpp b/src/zenserver/compute/computeserver.cpp
index 173f56386..0f9ef0287 100644
--- a/src/zenserver/compute/computeserver.cpp
+++ b/src/zenserver/compute/computeserver.cpp
@@ -82,7 +82,7 @@ ZenComputeServer::Initialize(const ZenComputeServerConfig& ServerConfig, ZenServ
 	ZEN_TRACE_CPU("ZenComputeServer::Initialize");
 	ZEN_MEMSCOPE(GetZenserverTag());
 
-	ZEN_INFO(ZEN_APP_NAME " initializing in HUB server mode");
+	ZEN_INFO(ZEN_APP_NAME " initializing in COMPUTE server mode");
 
 	const int EffectiveBasePort = ZenServerBase::Initialize(ServerConfig, ServerEntry);
 	if (EffectiveBasePort < 0)
@@ -91,7 +91,7 @@ ZenComputeServer::Initialize(const ZenComputeServerConfig& ServerConfig, ZenServ
 	}
 
 	// This is a workaround to make sure we can have automated tests. Without
-	// this the ranges for different child zen hub processes could overlap with
+	// this the ranges for different child zen compute processes could overlap with
 	// the main test range.
 	ZenServerEnvironment::SetBaseChildId(1000);
 
@@ -109,7 +109,7 @@ ZenComputeServer::Initialize(const ZenComputeServerConfig& ServerConfig, ZenServ
 void
 ZenComputeServer::Cleanup()
 {
-	ZEN_TRACE_CPU("ZenStorageServer::Cleanup");
+	ZEN_TRACE_CPU("ZenComputeServer::Cleanup");
 	ZEN_INFO(ZEN_APP_NAME " cleaning up");
 	try
 	{
diff --git a/src/zenserver/hub/zenhubserver.cpp b/src/zenserver/hub/zenhubserver.cpp
index 7a4ba951d..d0a0db417 100644
--- a/src/zenserver/hub/zenhubserver.cpp
+++ b/src/zenserver/hub/zenhubserver.cpp
@@ -105,7 +105,7 @@ ZenHubServer::Initialize(const ZenHubServerConfig& ServerConfig, ZenServerState:
 void
 ZenHubServer::Cleanup()
 {
-	ZEN_TRACE_CPU("ZenStorageServer::Cleanup");
+	ZEN_TRACE_CPU("ZenHubServer::Cleanup");
 	ZEN_INFO(ZEN_APP_NAME " cleaning up");
 	try
 	{
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 7bf6126df..5fd35d9b4 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -617,6 +617,8 @@ ZenServerMain::Run()
 			{
 				ZEN_INFO(ZEN_APP_NAME " unable to grab lock at '{}' (reason: '{}'), retrying", LockFilePath, Ec.message());
 				Sleep(500);
+
+				m_LockFile.Create(LockFilePath, MakeLockData(false), Ec);
 				if (Ec)
 				{
 					ZEN_WARN(ZEN_APP_NAME " exiting, unable to grab lock at '{}' (reason: '{}')", LockFilePath, Ec.message());