diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
index 4a63d376a..1b3962ff0 100644
--- a/vm/src/obj/objtype.rs
+++ b/vm/src/obj/objtype.rs
@@ -47,7 +47,7 @@ impl PyValue for PyClass {
 
 #[pyimpl(flags(BASETYPE))]
 impl PyClassRef {
-    pub fn iter_mro<'a>(&'a self) -> impl Iterator<Item = &'a PyClassRef> + DoubleEndedIterator {
+    pub fn iter_mro(&self) -> impl Iterator<Item = &PyClassRef> + DoubleEndedIterator {
         std::iter::once(self).chain(self.mro.iter())
     }
 
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
index 92626849a..3e493ccc5 100644
--- a/vm/src/vm.rs
+++ b/vm/src/vm.rs
@@ -649,8 +649,8 @@ impl VirtualMachine {
                 descriptor,
                 vec![
                     descr,
-                    obj.unwrap_or(self.get_none()),
-                    cls.unwrap_or(self.get_none()),
+                    obj.unwrap_or_else(|| self.get_none()),
+                    cls.unwrap_or_else(|| self.get_none()),
                 ],
             ))
         } else {