diff --git a/trains/automation/controller.py b/trains/automation/controller.py
index 40048f94..10a533fd 100644
--- a/trains/automation/controller.py
+++ b/trains/automation/controller.py
@@ -362,7 +362,7 @@ class PipelineController(object):
         return True
 
     def _verify_node(self, node):
-        # type: (Node) -> bool
+        # type: (PipelineController.Node) -> bool
         """
         Raise ValueError on verification errors
 
@@ -407,7 +407,7 @@ class PipelineController(object):
         return not bool(set(self._nodes.keys()) - visited)
 
     def _launch_node(self, node):
-        # type: (Node) -> ()
+        # type: (PipelineController.Node) -> ()
         """
         Launch a single node (create and enqueue a TrainsJob)
 
@@ -618,7 +618,7 @@ class PipelineController(object):
                 pass
 
     def __verify_step_reference(self, node, step_ref_string):
-        # type: (Node, str) -> bool
+        # type: (PipelineController.Node, str) -> bool
         """
         Verify the step reference. For example "${step1.parameters.Args/param}"
         :param Node node: calling reference node (used for logging)
diff --git a/trains/binding/frameworks/tensorflow_bind.py b/trains/binding/frameworks/tensorflow_bind.py
index 805937f0..21135010 100644
--- a/trains/binding/frameworks/tensorflow_bind.py
+++ b/trains/binding/frameworks/tensorflow_bind.py
@@ -1329,19 +1329,19 @@ class PatchKerasModelIO(object):
         if 'tensorflow' in sys.modules and not PatchKerasModelIO.__patched_tensorflow:
             try:
                 # hack: make sure tensorflow.__init__ is called
-                import tensorflow  # noqa: F401
+                import tensorflow  # noqa: F401, F811
                 from tensorflow.python.keras.engine.network import Network
             except ImportError:
                 Network = None
             try:
                 # hack: make sure tensorflow.__init__ is called
-                import tensorflow  # noqa: F401
+                import tensorflow  # noqa: F401, F811
                 from tensorflow.python.keras.engine.functional import Functional
             except ImportError:
                 Functional = None
             try:
                 # hack: make sure tensorflow.__init__ is called
-                import tensorflow  # noqa: F811
+                import tensorflow  # noqa: F401, F811
                 from tensorflow.python.keras.engine.sequential import Sequential
             except ImportError:
                 Sequential = None
@@ -1357,7 +1357,7 @@ class PatchKerasModelIO(object):
                     Network if PatchKerasModelIO.__patched_keras[0] != Network else None,
                     Sequential if PatchKerasModelIO.__patched_keras[1] != Sequential else None,
                     keras_saving if PatchKerasModelIO.__patched_keras[2] != keras_saving else None,
-                    Functional if PatchKerasModelIO.__patched_keras[3] != Functional else None,]
+                    Functional if PatchKerasModelIO.__patched_keras[3] != Functional else None, ]
             else:
                 PatchKerasModelIO.__patched_tensorflow = [Network, Sequential, keras_saving, Functional]
             PatchKerasModelIO._patch_io_calls(*PatchKerasModelIO.__patched_tensorflow)