diff --git a/csaxs_bec/devices/omny/galil/galil_rio.py b/csaxs_bec/devices/omny/galil/galil_rio.py
index dec6030..ed9c021 100644
--- a/csaxs_bec/devices/omny/galil/galil_rio.py
+++ b/csaxs_bec/devices/omny/galil/galil_rio.py
@@ -18,7 +18,7 @@ import time
 from typing import TYPE_CHECKING
 
 from ophyd import Component as Cpt
-from ophyd import Kind
+from ophyd import Device, Kind
 from ophyd_devices import PSIDeviceBase
 from ophyd_devices.utils.controller import Controller, threadlocked
 from ophyd_devices.utils.socket import SocketIO
@@ -70,7 +70,7 @@ class GalilRIOSignalRO(GalilSignalRO):
     """
 
     def __init__(self, signal_name: str, channel: int, **kwargs):
-        super().__init__(signal_name=signal_name, **kwargs)
+        super().__init__(signal_name, **kwargs)
         self._channel = channel
 
     def _socket_get(self) -> float:
@@ -118,10 +118,11 @@ class GalilRIO(PSIDeviceBase):
     ):
         if port is None:
             port = 23  # Default port for Galil RIO controller
-        super().__init__(name=name, device_manager=device_manager, scan_info=scan_info, **kwargs)
         self.controller = GalilRIOController(
-            socket_cls=socket_cls, host=host, port=port, device_manager=device_manager
+            socket_cls=socket_cls, socket_host=host, socket_port=port, device_manager=device_manager
         )
+        super().__init__(name=name, device_manager=device_manager, scan_info=scan_info, **kwargs)
+
         self._metadata["connected"] = False
 
     def wait_for_connection(self, timeout: float = 30.0, **kwargs) -> None: