diff --git a/FlowCytometryTools/core/bases.py b/FlowCytometryTools/core/bases.py
index 3d7b7e4..5fe1115 100644
--- a/FlowCytometryTools/core/bases.py
+++ b/FlowCytometryTools/core/bases.py
@@ -97,7 +97,7 @@ def queueable(fun, *args, **kwargs):
             '"%s" must be a parameter of queued function "%s"' % (_now, fun.__name__)
         )
     f_name = fun.__name__
-    kw_name = inspect.getargspec(fun).keywords
+    kw_name = inspect.getfullargspec(fun).varkw
     kws = params.pop(kw_name, {})
     params.update(kws)
     if params[_now]:
@@ -368,6 +368,14 @@ def apply(self, func, applyto="measurement", noneval=nan, setdata=False):
 
 
 Well = Measurement
+import collections
+try:
+    from collections import abc
+    collections.MutableMapping = abc.MutableMapping
+    collections.Iterable = abc.Iterable
+    collections.Mapping = abc.Mapping
+except:
+    pass
 
 
 class MeasurementCollection(abc.MutableMapping, BaseObject):
diff --git a/FlowCytometryTools/core/containers.py b/FlowCytometryTools/core/containers.py
index c33c437..9f6817b 100644
--- a/FlowCytometryTools/core/containers.py
+++ b/FlowCytometryTools/core/containers.py
@@ -132,11 +132,11 @@ def plot(
         plot_output = graph.plotFCM(self.data, channel_names, kind=kind, **kwargs)
 
         if gates is not None:
+
             if gate_colors is None:
                 gate_colors = cycle(("b", "g", "r", "m", "c", "y"))
 
-            if not isinstance(gate_lw, collections.Iterable):
-                gate_lw = [gate_lw]
+            gate_lw = [gate_lw]
 
             gate_lw = cycle(gate_lw)