diff --git a/MAC/APL/PAC/BeamServer/src/BeamServer.cc b/MAC/APL/PAC/BeamServer/src/BeamServer.cc
index afd61041d94dde674831b45d23b5516898e6130e..bfda941e60d644138137cb013a0304ebb0883b9b 100644
--- a/MAC/APL/PAC/BeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/BeamServer/src/BeamServer.cc
@@ -836,12 +836,12 @@ int main(int argc, char** argv)
     exit(EXIT_FAILURE);
   }
 
-  BeamServer beamserver("BeamServer");
-
-  beamserver.start(); // make initial transition
-
   try
   {
+    BeamServer beamserver("BeamServer");
+
+    beamserver.start(); // make initial transition
+
     GCFTask::run();
   }
   catch (Exception e)
diff --git a/MAC/APL/PAC/BeamServer/src/BeamServer.conf.in b/MAC/APL/PAC/BeamServer/src/BeamServer.conf.in
index 801a136268ed0c31c4b64f890d0380a089139dcc..cf955ebf3657eef564084db9667d4f33013fe0a5 100644
--- a/MAC/APL/PAC/BeamServer/src/BeamServer.conf.in
+++ b/MAC/APL/PAC/BeamServer/src/BeamServer.conf.in
@@ -1,5 +1,5 @@
 #
-# Configuration of the BeamServern
+# Configuration of the BeamServer
 #
 
 #
diff --git a/MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in b/MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in
index a444a74550d00d62687a1af23eeb65b853d3e0a6..faf2c6ba8b7b48c00bf05a3f3bfff2e538efa4ba 100644
--- a/MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in
+++ b/MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in
@@ -9,7 +9,7 @@ mac.ns.BeamServer.acceptor.type=TCP
 mac.ns.BeamServer.rspdriver.type=TCP
 mac.top.BeamServer.rspdriver.remoteservice=RSPDriver:acceptor
 mac.ns.BeamServer.calserver.type=TCP
-mac.top.BeamServer.calserver.remoteservice=CalServer:acceptor_v2
+mac.top.BeamServer.calserver.remoteservice=CalServer:acceptor
 
 #
 # RSPDriver configuration