diff --git a/rigify/metarig_menu.py b/rigify/metarig_menu.py
index 20225e1012c0c503df2d71884c072d8aef71d82d..4bdf270174d8808f59b7cfe0f5d219000f2d9219 100644
--- a/rigify/metarig_menu.py
+++ b/rigify/metarig_menu.py
@@ -118,7 +118,7 @@ def register():
 
 
 def unregister():
-    for mop in metarig_ops:
+    for mop, name in metarig_ops:
         bpy.utils.unregister_class(mop)
 
     for mf in menu_funcs:
diff --git a/rigify/ui.py b/rigify/ui.py
index 3ff46b67ad322da490c13abfeaf5eb616fd6237e..e95e477487a3bc0fbf66b8c91460704ba4d3acaf 100644
--- a/rigify/ui.py
+++ b/rigify/ui.py
@@ -433,4 +433,4 @@ def unregister():
     bpy.utils.unregister_class(Sample)
     bpy.utils.unregister_class(EncodeMetarig)
     bpy.utils.unregister_class(EncodeMetarigSample)
-    bpy.utils.register_class(EncodeWidget)
+    bpy.utils.unregister_class(EncodeWidget)