diff --git a/common/JackConstants.h b/common/JackConstants.h
index ed1731ea..974f9238 100644
--- a/common/JackConstants.h
+++ b/common/JackConstants.h
@@ -64,9 +64,6 @@
 
 #define JACK_DEFAULT_SERVER_NAME "default"
 
-#define jack_server_entry "jackdmp_entry"
-#define jack_client_entry "jack_client"
-
 #define ALL_CLIENTS -1 // for notification
 
 #define JACK_PROTOCOL_VERSION 8
diff --git a/common/JackControlAPI.cpp b/common/JackControlAPI.cpp
index 3cc1141c..46c366d4 100644
--- a/common/JackControlAPI.cpp
+++ b/common/JackControlAPI.cpp
@@ -728,7 +728,7 @@ SERVER_EXPORT jackctl_server_t * jackctl_server_create(
     server_ptr->parameters = NULL;
     server_ptr->engine = NULL;
 
-    strcpy(value.str, JACK_DEFAULT_SERVER_NAME);
+    strcpy(value.str, JackTools::DefaultServerName());
     if (jackctl_add_parameter(
             &server_ptr->parameters,
             "name",
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index b7e7639a..419ba3fe 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -165,7 +165,7 @@ int JackServer::InternalClientLoadAux(JackLoadableInternalClient* client, const
     *status = 0;
 
     // Client object is internally kept in JackEngine
-    if ((client->Init(so_name) < 0) || (client->Open(JACK_DEFAULT_SERVER_NAME, client_name,  uuid, (jack_options_t)options, (jack_status_t*)status) < 0)) {
+    if ((client->Init(so_name) < 0) || (client->Open(JackTools::DefaultServerName(), client_name,  uuid, (jack_options_t)options, (jack_status_t*)status) < 0)) {
         delete client;
         int my_status1 = *status | JackFailure;
         *status = (jack_status_t)my_status1;
diff --git a/common/JackServerGlobals.cpp b/common/JackServerGlobals.cpp
index 7d909bed..2c3ff01d 100644
--- a/common/JackServerGlobals.cpp
+++ b/common/JackServerGlobals.cpp
@@ -304,8 +304,9 @@ bool JackServerGlobals::Init()
         }
 
 #ifndef WIN32
-        if (server_name == NULL)
+        if (server_name == NULL) {
             server_name = (char*)JackTools::DefaultServerName();
+        }
 #endif
 
         rc = jack_register_server(server_name, false);
@@ -327,8 +328,9 @@ bool JackServerGlobals::Init()
         jack_cleanup_shm();
         JackTools::CleanupFiles(server_name);
 
-        if (!realtime && client_timeout == 0)
+        if (!realtime && client_timeout == 0) {
             client_timeout = 500; /* 0.5 sec; usable when non realtime. */
+        }
 
         for (i = 0; i < argc; i++) {
             free(argv[i]);
@@ -376,14 +378,16 @@ bool JackServerGlobals::Init()
         }
     }
 
-    if (master_driver_params)
+    if (master_driver_params) {
         jack_free_driver_params(master_driver_params);
+    }
     return true;
 
 error:
     jack_log("JackServerGlobals Init error");
-    if (master_driver_params)
+    if (master_driver_params) {
         jack_free_driver_params(master_driver_params);
+    }
     Destroy();
     return false;
 }
diff --git a/common/JackTools.cpp b/common/JackTools.cpp
index 58ca9b11..ef94a2db 100644
--- a/common/JackTools.cpp
+++ b/common/JackTools.cpp
@@ -79,8 +79,9 @@ namespace Jack {
     const char* JackTools::DefaultServerName()
     {
         const char* server_name;
-        if ((server_name = getenv("JACK_DEFAULT_SERVER")) == NULL)
+        if ((server_name = getenv("JACK_DEFAULT_SERVER")) == NULL) {
             server_name = JACK_DEFAULT_SERVER_NAME;
+        }
         return server_name;
     }