diff --git a/core/src/lib/bnet_server_tcp.cc b/core/src/lib/bnet_server_tcp.cc
index 3e2ef4167e2..ea51349ef78 100644
--- a/core/src/lib/bnet_server_tcp.cc
+++ b/core/src/lib/bnet_server_tcp.cc
@@ -48,7 +48,7 @@
 #  include <arpa/nameser.h>
 #endif
 #ifdef HAVE_RESOLV_H
-//#include <resolv.h>
+// #include <resolv.h>
 #endif
 
 #ifdef HAVE_POLL_H
@@ -289,7 +289,7 @@ void BnetThreadServerTcp(
       return;
     }
 
-    listen(fd_ptr->fd, 50); /* tell system we are ready */
+    listen(fd_ptr->fd, kListenBacklog); /* tell system we are ready */
     sockfds->append(fd_ptr);
 
 #ifdef HAVE_POLL
diff --git a/core/src/lib/bnet_server_tcp.h b/core/src/lib/bnet_server_tcp.h
index 178ac1433d2..3e041c0910e 100644
--- a/core/src/lib/bnet_server_tcp.h
+++ b/core/src/lib/bnet_server_tcp.h
@@ -24,6 +24,8 @@
 #include <atomic>
 #include <functional>
 
+constexpr int kListenBacklog = 50;
+
 class ConfigurationParser;
 class ThreadList;
 class IPADDR;
diff --git a/core/src/stored/ndmp_tape.cc b/core/src/stored/ndmp_tape.cc
index 2e938c014dc..df64aaefc5a 100644
--- a/core/src/stored/ndmp_tape.cc
+++ b/core/src/stored/ndmp_tape.cc
@@ -167,10 +167,8 @@ void NdmpLoghandler(struct ndmlog* log, char* tag, int level, char* msg)
   nis = (NIS*)log->ctx;
   if (!nis) { return; }
 
-  /*
-   * If the log level of this message is under our logging treshold we
-   * log it as part of the Job.
-   */
+  /* If the log level of this message is under our logging treshold we
+   * log it as part of the Job. */
   if (level <= (int)nis->LogLevel) {
     if (nis->jcr) {
       // Look at the tag field to see what is logged.
@@ -1164,7 +1162,7 @@ extern "C" void* ndmp_thread_server(void* arg)
             be.bstrerror());
 #  endif
     }
-    listen(fd_ptr->fd, me->MaxConnections); /* tell system we are ready */
+    listen(fd_ptr->fd, kListenBacklog); /* tell system we are ready */
     sockfds.push_back(fd_ptr);
 #  ifdef HAVE_POLL
     nfds++;