diff --git a/colorbleed/plugins/maya/publish/extract_look.py b/colorbleed/plugins/maya/publish/extract_look.py
index d6767bea49..7e8fc2b436 100644
--- a/colorbleed/plugins/maya/publish/extract_look.py
+++ b/colorbleed/plugins/maya/publish/extract_look.py
@@ -7,6 +7,7 @@ from maya import cmds
 import pyblish.api
 import avalon.maya
 import colorbleed.api
+import colorbleed.maya.lib as maya
 
 from cb.utils.maya import context
 
@@ -65,7 +66,7 @@ class ExtractLook(colorbleed.api.Extractor):
         with context.renderlayer(layer):
             # TODO: Ensure membership edits don't become renderlayer overrides
             with context.empty_sets(sets, force=True):
-                with context.attribute_values(remap):
+                with maya.attribute_values(remap):
                     with avalon.maya.maintained_selection():
                         cmds.select(sets, noExpand=True)
                         cmds.file(maya_path,
diff --git a/colorbleed/plugins/maya/publish/extract_yeti_rig.py b/colorbleed/plugins/maya/publish/extract_yeti_rig.py
index 923d9a6ba9..7806c0642f 100644
--- a/colorbleed/plugins/maya/publish/extract_yeti_rig.py
+++ b/colorbleed/plugins/maya/publish/extract_yeti_rig.py
@@ -6,7 +6,7 @@ from maya import cmds
 
 import avalon.maya.lib as lib
 import colorbleed.api
-from cb.utils.maya import context
+import colorbleed.maya.lib as maya
 
 
 @contextlib.contextmanager
@@ -25,7 +25,7 @@ def disconnected_attributes(settings, members):
             try:
                 source = sources[0]
             except IndexError:
-                print "source_id:", input["sourceID"]
+                print("source_id:", input["sourceID"])
                 continue
 
             # Get destination shapes (the shapes used as hook up)
@@ -52,7 +52,7 @@ def disconnected_attributes(settings, members):
             try:
                 cmds.connectAttr(connection[0], connection[1])
             except Exception as e:
-                print e,
+                print(e)
                 continue
 
 
@@ -112,7 +112,7 @@ class ExtractYetiRig(colorbleed.api.Extractor):
 
         nodes = instance.data["setMembers"]
         with disconnected_attributes(settings, members):
-            with context.attribute_values(attr_value):
+            with maya.attribute_values(attr_value):
                 cmds.select(nodes, noExpand=True)
                 cmds.file(maya_path,
                           force=True,