diff --git a/src/device/service/Tools.py b/src/device/service/Tools.py
index af7a8e2820c9954f7a181addca259cf29b3fb984..c17bed0b7ad8b34883179931f12b4adaefa60d3b 100644
--- a/src/device/service/Tools.py
+++ b/src/device/service/Tools.py
@@ -21,7 +21,6 @@ from common.proto.device_pb2 import MonitoringSettings
 from common.proto.kpi_sample_types_pb2 import KpiSampleType
 from common.tools.grpc.ConfigRules import update_config_rule_custom
 from common.tools.grpc.Tools import grpc_message_to_json
-from context.client.ContextClient import ContextClient
 from .driver_api._Driver import _Driver, RESOURCE_ENDPOINTS
 from .monitoring.MonitoringLoops import MonitoringLoops
 from .Errors import (
@@ -145,6 +144,7 @@ def _raw_config_rules_to_grpc(
 def populate_config_rules(device : Device, driver : _Driver) -> List[str]:
     device_uuid = device.device_id.device_uuid.uuid
     results_getconfig = driver.GetConfig()
+    LOGGER.warning('results_getconfig = {:s}'.format(str(results_getconfig)))
     return _raw_config_rules_to_grpc(
         device_uuid, device.device_config, ERROR_GET, ConfigActionEnum.CONFIGACTION_SET, results_getconfig)
 
diff --git a/src/device/service/drivers/emulated/EmulatedDriver.py b/src/device/service/drivers/emulated/EmulatedDriver.py
index 4f5effce0a8b6156ce99a73b49b71f157d891286..5d2ac6d039bec76dc3f1a68e92362c327bce83dd 100644
--- a/src/device/service/drivers/emulated/EmulatedDriver.py
+++ b/src/device/service/drivers/emulated/EmulatedDriver.py
@@ -29,7 +29,7 @@ from .Tools import compose_resource_endpoint
 
 LOGGER = logging.getLogger(__name__)
 
-RE_GET_ENDPOINT_FROM_INTERFACE = re.compile(r'.*\/interface\[([^\]]+)\].*')
+RE_GET_ENDPOINT_FROM_INTERFACE = re.compile(r'^\/interface\[([^\]]+)\].*')
 
 HISTOGRAM_BUCKETS = (
     # .005, .01, .025, .05, .075, .1, .25, .5, .75, 1.0, INF