diff --git a/src/server.cpp b/src/server.cpp
index 430e218..7fb6f7c 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -134,7 +134,6 @@ Server& Server::addSource(const std::string& name,
         throw std::logic_error(SB()<<"Attempt to add NULL Source "<<name<<" at "<<order);
     {
         auto G(pvt->sourcesLock.lockWriter());
-        //epicsGuard<RWLock::Writer> G(pvt->sourcesLock.writer());
 
         auto& ent = pvt->sources[std::make_pair(order, name)];
         if(ent)
diff --git a/src/serverconn.cpp b/src/serverconn.cpp
index 4453f85..96aa6d2 100644
--- a/src/serverconn.cpp
+++ b/src/serverconn.cpp
@@ -426,7 +426,7 @@ void ServerConn::bevRead()
                 CASE(MESSAGE);
 #undef CASE
             }
-            // handlers may be cleared bev to force disconnect
+            // handlers may have cleared bev to force disconnect
             if(!bev)
                 break;
 
diff --git a/src/serverconn.h b/src/serverconn.h
index 9e3710a..a1b1b61 100644
--- a/src/serverconn.h
+++ b/src/serverconn.h
@@ -200,12 +200,12 @@ struct Server::Pvt
 
     epicsEvent done;
 
+    std::vector<uint8_t> beaconMsg;
+
     // handle server "background" tasks.
     // accept new connections and send beacons
     evbase acceptor_loop;
 
-    std::vector<uint8_t> beaconMsg;
-
     std::list<std::unique_ptr<UDPListener> > listeners;
     std::vector<SockAddr> beaconDest;