diff --git a/buildman/basecomponent.py b/buildman/basecomponent.py
index 3cf5bc26b..5a1d04536 100644
--- a/buildman/basecomponent.py
+++ b/buildman/basecomponent.py
@@ -2,10 +2,10 @@ from autobahn.asyncio.wamp import ApplicationSession
 
 class BaseComponent(ApplicationSession):
   """ Base class for all registered component sessions in the server. """
-  server = None
-  parent_manager = None
-  build_logs = None
-  user_files = None
 
   def __init__(self, config, **kwargs):
     ApplicationSession.__init__(self, config)
+    self.server = None
+    self.parent_manager = None
+    self.build_logs = None
+    self.user_files = None
diff --git a/buildman/buildcomponent.py b/buildman/buildcomponent.py
index 4daa93156..3c57e912f 100644
--- a/buildman/buildcomponent.py
+++ b/buildman/buildcomponent.py
@@ -146,8 +146,9 @@ class BuildComponent(BaseComponent):
     LOGGER.debug('Invoking build: %s', self.builder_realm)
     LOGGER.debug('With Arguments: %s', build_arguments)
 
-    return (self.call("io.quay.builder.build", **build_arguments)
-                .add_done_callback(self._build_complete))
+    return (self
+            .call("io.quay.builder.build", **build_arguments)
+            .add_done_callback(self._build_complete))
 
   @staticmethod
   def _total_completion(statuses, total_images):