diff --git a/src/plumpy/futures.py b/src/plumpy/futures.py
index ed43389e..a2f1071e 100644
--- a/src/plumpy/futures.py
+++ b/src/plumpy/futures.py
@@ -9,7 +9,7 @@
 import contextlib
 from typing import Any, Awaitable, Callable, Generator, Optional
 
-__all__ = ['CancellableAction', 'capture_exceptions', 'create_task', 'create_task']
+__all__ = ['CancellableAction', 'Future', 'capture_exceptions', 'create_task', 'create_task']
 
 
 class InvalidFutureError(Exception):
diff --git a/src/plumpy/processes.py b/src/plumpy/processes.py
index 7e82a9c3..fbb59db5 100644
--- a/src/plumpy/processes.py
+++ b/src/plumpy/processes.py
@@ -1332,6 +1332,7 @@ async def step(self) -> None:
             self._stepping = True
             next_state = None
             try:
+                # XXX: debug log when need to step to next state
                 next_state = await self._run_task(self._state.execute)
             except process_states.Interruption as exception:
                 # If the interruption was caused by a call to a Process method then there should
diff --git a/src/plumpy/rmq/__init__.py b/src/plumpy/rmq/__init__.py
index c44c5a2e..a046d229 100644
--- a/src/plumpy/rmq/__init__.py
+++ b/src/plumpy/rmq/__init__.py
@@ -1,7 +1,20 @@
 # -*- coding: utf-8 -*-
 # mypy: disable-error-code=name-defined
-from .communications import *
-from .futures import *
-from .process_control import *
+from .communications import Communicator, DeliveryFailed, RemoteException, TaskRejected, wrap_communicator
+from .futures import unwrap_kiwi_future, wrap_to_concurrent_future
+from .process_control import RemoteProcessController, RemoteProcessThreadController
 
-__all__ = communications.__all__ + futures.__all__ + process_control.__all__
+__all__ = [
+    # communications
+    'Communicator',
+    'DeliveryFailed',
+    'RemoteException',
+    # process_control
+    'RemoteProcessController',
+    'RemoteProcessThreadController',
+    'TaskRejected',
+    # futures
+    'unwrap_kiwi_future',
+    'wrap_communicator',
+    'wrap_to_concurrent_future',
+]