diff --git a/evennia/contrib/menusystem.py b/evennia/contrib/menusystem.py
index 20e98a6acf..4ab99ec40d 100644
--- a/evennia/contrib/menusystem.py
+++ b/evennia/contrib/menusystem.py
@@ -497,7 +497,7 @@ def prompt_choice(caller, question="", prompts=None, choicefunc=None, force_choo
     count = 0
     choices = ""
     commands = []
-    for choice in utils.makeiter(prompts):
+    for choice in utils.make_iter(prompts):
         count += 1
         choices += "\n{lc%d{lt[%d]{le %s" % (count, count, choice)
 
diff --git a/evennia/locks/lockfuncs.py b/evennia/locks/lockfuncs.py
index b3393701b2..32f5cb6e24 100644
--- a/evennia/locks/lockfuncs.py
+++ b/evennia/locks/lockfuncs.py
@@ -176,7 +176,7 @@ def perm(accessing_obj, accessed_obj, *args, **kwargs):
                 else:
                     return hpos_target <= min(hpos_player, hpos_object)
             elif gtmode:
-                return gtmode and hpos_target < hpos_player
+                return hpos_target < hpos_player
             else:
                 return hpos_target <= hpos_player
         elif not is_quell and perm in perms_player: