diff --git a/src/context/service/ContextServiceServicerImpl.py b/src/context/service/ContextServiceServicerImpl.py
index 6854d4ff8688cf3e87c20a67de9307304ed07e81..93f078e75545c93a2cd312cf48e8f64cdeea87ac 100644
--- a/src/context/service/ContextServiceServicerImpl.py
+++ b/src/context/service/ContextServiceServicerImpl.py
@@ -124,9 +124,7 @@ class ContextServiceServicerImpl(ContextServiceServicer, ContextPolicyServiceSer
 
     @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
     def ListDevices(self, request : Empty, context : grpc.ServicerContext) -> DeviceList:
-        devices = device_list_objs(self.db_engine)
-        LOGGER.info('DEVICES: {:s}'.format(str(devices)))
-        return DeviceList(devices=devices)
+        return device_list_objs(self.db_engine)
 
     @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
     def GetDevice(self, request : ContextId, context : grpc.ServicerContext) -> Device:
diff --git a/src/context/service/database/Device.py b/src/context/service/database/Device.py
index 6da7c91bbb852a66ff10104bde0b12fe86f814e2..c4f2b3d95fad4b9e523f77ef9dbceab4b4f03b37 100644
--- a/src/context/service/database/Device.py
+++ b/src/context/service/database/Device.py
@@ -64,6 +64,7 @@ def device_get(db_engine : Engine, request : DeviceId) -> Device:
         obj : Optional[DeviceModel] = session.query(DeviceModel)\
             .options(selectinload(DeviceModel.endpoints))\
             .options(selectinload(DeviceModel.config_rules))\
+            .options(selectinload(DeviceModel.components))\
             .filter_by(device_uuid=device_uuid).one_or_none()
         return None if obj is None else obj.dump()
     obj = run_transaction(sessionmaker(bind=db_engine), callback)
diff --git a/src/device/service/drivers/openconfig/templates/Namespace.py b/src/device/service/drivers/openconfig/templates/Namespace.py
index b70d5c32775075ae299bf18f8ecfc530544efe7b..bdc27a1ff30d5ac18b9233cdd420cd8493e7a419 100644
--- a/src/device/service/drivers/openconfig/templates/Namespace.py
+++ b/src/device/service/drivers/openconfig/templates/Namespace.py
@@ -45,5 +45,5 @@ NAMESPACES = {
     'ocpt2': NAMESPACE_POLICY_TYPES_2,
     'ocrp' : NAMESPACE_ROUTING_POLICY,
     'ocv'  : NAMESPACE_VLAN,
-    'ocptr' : NAMESPACE_PLATFORM_TRANSCEIVER,
+    'ocptr': NAMESPACE_PLATFORM_TRANSCEIVER,
 }