diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json
index cee2cb24cbd336bf17d25760b2f13d599ea17ddb..6886437ce7cf02ee741b5b70f07ebfbf71b08b4d 100644
--- a/CDB/LOFAR_ConfigDb.json
+++ b/CDB/LOFAR_ConfigDb.json
@@ -1,6 +1,6 @@
 {
     "servers": {
-        "docker_device": {
+        "Docker": {
             "STAT": {
                 "Docker": {
                     "STAT/Docker/1": {}
@@ -14,7 +14,7 @@
                 }
             }
         },
-        "observation_control": {
+        "ObservationControl": {
             "STAT": {
                 "ObservationControl": {
                     "STAT/ObservationControl/1": {}
diff --git a/CDB/stations/simulators_ConfigDb.json b/CDB/stations/simulators_ConfigDb.json
index 615976f006bbf571adbca93b75e3d172c30f68a4..df2ffc1c1194282f7cc92cd0e7df1e5eb90b3a58 100644
--- a/CDB/stations/simulators_ConfigDb.json
+++ b/CDB/stations/simulators_ConfigDb.json
@@ -28,7 +28,7 @@
                                 "apspu-sim"
                             ],
                             "OPC_Server_Port": [
-                                "4843"
+                                "4842"
                             ],
                             "OPC_Time_Out": [
                                 "5.0"
diff --git a/docker-compose/device-apsct.yml b/docker-compose/device-apsct.yml
index bab24bd77499c6b6aea5cc27cb98588227c7c046..60f65fc47ed81822242282fc743846221acec2d9 100644
--- a/docker-compose/device-apsct.yml
+++ b/docker-compose/device-apsct.yml
@@ -37,5 +37,5 @@ services:
       - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - l2ss-apspu Apsct STAT -v  -v -ORBendPoint giop:tcp:0:5709 -ORBendPointPublish giop:tcp:${HOSTNAME}:5709
+      - l2ss-apsct Apsct STAT -v  -v -ORBendPoint giop:tcp:0:5709 -ORBendPointPublish giop:tcp:${HOSTNAME}:5709
     restart: on-failure
diff --git a/tangostationcontrol/tangostationcontrol/common/lofar_logging.py b/tangostationcontrol/tangostationcontrol/common/lofar_logging.py
index 46d417c67987b1cec37897552ad35446ac7fdae1..cfff61966f11a06c2fcf0e336da32eba24bfbfe2 100644
--- a/tangostationcontrol/tangostationcontrol/common/lofar_logging.py
+++ b/tangostationcontrol/tangostationcontrol/common/lofar_logging.py
@@ -150,7 +150,7 @@ def configure_logger(logger: logging.Logger=None, log_extra=None, debug=False):
         from logstash_async.handler import AsynchronousLogstashHandler, LogstashFormatter
 
         # log to the tcp_input of logstash in our ELK stack
-        handler = AsynchronousLogstashHandler("elk", 5959, database_path='pending_log_messages.db')
+        handler = AsynchronousLogstashHandler("elk", 5959, database_path='/tmp/lofar_pending_log_messages.db')
 
         # configure log messages
         formatter = LogstashFormatter(extra=log_extra, tags=["python", "lofar"])
diff --git a/tangostationcontrol/tangostationcontrol/devices/apsct.py b/tangostationcontrol/tangostationcontrol/devices/apsct.py
index 7c1872e73c8fcdffa6ca9e07a7b3cd059bde044f..add4e146cdb5fb4282a49f9394c552465b088a26 100644
--- a/tangostationcontrol/tangostationcontrol/devices/apsct.py
+++ b/tangostationcontrol/tangostationcontrol/devices/apsct.py
@@ -14,7 +14,7 @@
 # PyTango imports
 from tango import DebugIt
 from tango.server import run, command
-from tango import AttrWriteType
+from tango import AttrWriteType, DevState
 import numpy
 # Additional import
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/boot.py b/tangostationcontrol/tangostationcontrol/devices/boot.py
index 355a8c944361feaee09b70196450a5401c598565..5b0acd2a587f6076e3a416151a30369a8a924478 100644
--- a/tangostationcontrol/tangostationcontrol/devices/boot.py
+++ b/tangostationcontrol/tangostationcontrol/devices/boot.py
@@ -21,9 +21,9 @@ from tango import AttrWriteType, DeviceProxy, DevState
 # Additional import
 import numpy
 
-from device_decorators import *
+from tangostationcontrol.devices.device_decorators import *
 
-from tangostationcontrol.common.entry import entry
+from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.devices.lofar_device import lofar_device
 from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/docker_device.py b/tangostationcontrol/tangostationcontrol/devices/docker_device.py
index 5ed02acdb942f2fb6ec33c3c433ac18687962bc8..00f42ca816e1e8219cde06913ef633961a15366e 100644
--- a/tangostationcontrol/tangostationcontrol/devices/docker_device.py
+++ b/tangostationcontrol/tangostationcontrol/devices/docker_device.py
@@ -19,7 +19,7 @@ import numpy
 import asyncio
 # Additional import
 
-from device_decorators import *
+from tangostationcontrol.devices.device_decorators import *
 
 # Additional import
 from tangostationcontrol.common.entrypoint import entry
diff --git a/tangostationcontrol/tangostationcontrol/devices/recv.py b/tangostationcontrol/tangostationcontrol/devices/recv.py
index a920dd59e393da0d5497700e31fb064fedae7ad9..4ac93d85abcf66d4c8dc25ab60a1fae89fbef794 100644
--- a/tangostationcontrol/tangostationcontrol/devices/recv.py
+++ b/tangostationcontrol/tangostationcontrol/devices/recv.py
@@ -15,7 +15,7 @@
 from tango import DebugIt
 from tango.server import run, command
 from tango.server import device_property, attribute
-from tango import AttrWriteType
+from tango import AttrWriteType, DevState
 import numpy
 
 # Additional import
diff --git a/tangostationcontrol/tangostationcontrol/devices/unb2.py b/tangostationcontrol/tangostationcontrol/devices/unb2.py
index 9ca54c5fbc4eaaba2a205744cad23af1bb139691..c4f623c5df5846858dd8d0aa0ab5fd53dff56ac3 100644
--- a/tangostationcontrol/tangostationcontrol/devices/unb2.py
+++ b/tangostationcontrol/tangostationcontrol/devices/unb2.py
@@ -14,7 +14,7 @@
 # PyTango imports
 from tango.server import run, command
 from tango.server import device_property, attribute
-from tango import AttrWriteType, DebugIt
+from tango import AttrWriteType, DebugIt, DevState
 # Additional import
 
 from tangostationcontrol.common.entrypoint import entry