diff --git a/voltha/adapters/openolt/openolt_data_model.py b/voltha/adapters/openolt/openolt_data_model.py
index 6dd111b..3dd635e 100644
--- a/voltha/adapters/openolt/openolt_data_model.py
+++ b/voltha/adapters/openolt/openolt_data_model.py
@@ -48,12 +48,14 @@
 
         self.nni_intf_id = None
 
+        self.proxy = registry('core').get_proxy('/')
+
     def reconcile(self):
         assert self.logical_device_id is not None
         self.adapter_agent.reconcile_logical_device(
             self.logical_device_id)
         # Update device cache
-        self.device = self.get_device(self.device.id)
+        self.device = self.adapter_agent.get_device(self.device.id)
 
     def olt_create(self, device_info):
         if self.logical_device_id is not None:
@@ -438,7 +440,7 @@
                 registry('adapter_loader').get_agent(onu_device.adapter)
             onu_adapter_agent.update_interface(onu_device,
                                                {'oper_state': 'down'})
-            self.onu_ports_down(onu_device)
+            self.__onu_ports_down(onu_device)
 
         # Children devices
         self.adapter_agent.update_child_devices_state(
diff --git a/voltha/adapters/openolt/openolt_device.py b/voltha/adapters/openolt/openolt_device.py
index 82c8009..e4b6e64 100644
--- a/voltha/adapters/openolt/openolt_device.py
+++ b/voltha/adapters/openolt/openolt_device.py
@@ -23,7 +23,6 @@
 from transitions import Machine
 
 from voltha.protos.device_pb2 import Port
-from voltha.registry import registry
 from voltha.adapters.openolt.protos import openolt_pb2_grpc, openolt_pb2
 from voltha.adapters.openolt.openolt_utils import OpenoltUtils
 from voltha.extensions.alarms.onu.onu_discovery_alarm import OnuDiscoveryAlarm
@@ -91,7 +90,6 @@
         self.host_and_port = device.host_and_port
         self.extra_args = device.extra_args
         self.log = structlog.get_logger(ip=self.host_and_port)
-        self.proxy = registry('core').get_proxy('/')
 
         self.log.info('openolt-device-init')