diff --git a/evennia/prototypes/spawner.py b/evennia/prototypes/spawner.py
index 42e2b5746a..d025f75f02 100644
--- a/evennia/prototypes/spawner.py
+++ b/evennia/prototypes/spawner.py
@@ -883,7 +883,8 @@ def spawn(*prototypes, caller=None, **kwargs):
     protparents = {prot["prototype_key"].lower(): prot for prot in protlib.search_prototype()}
 
     if not kwargs.get("only_validate"):
-        # homogenization to be more lenient about prototype format when entering the prototype manually
+        # homogenization to be more lenient about prototype format when entering the prototype
+        # manually
         prototypes = [protlib.homogenize_prototype(prot) for prot in prototypes]
 
     # overload module's protparents with specifically given protparents
diff --git a/evennia/utils/evmore.py b/evennia/utils/evmore.py
index a9a8e6d4f5..fdb2b42d12 100644
--- a/evennia/utils/evmore.py
+++ b/evennia/utils/evmore.py
@@ -39,7 +39,8 @@ the `caller.msg()` construct every time the page is updated.
 from django.conf import settings
 from django.db.models.query import QuerySet
 from django.core.paginator import Paginator
-from evennia import Command, CmdSet
+from evennia.commands.command import Command
+from evennia.commands.cmdset import CmdSet
 from evennia.commands import cmdhandler
 from evennia.utils.ansi import ANSIString
 from evennia.utils.utils import make_iter, inherits_from, justify, dedent