diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c
index 72d30e34d..7f00f37c4 100644
--- a/src/common/kernel/movement.c
+++ b/src/common/kernel/movement.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: movement.c,v 1.4 2001/02/03 13:45:32 enno Exp $
+ *	$Id: movement.c,v 1.5 2001/02/04 09:44:16 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -1662,7 +1662,7 @@ move(region * r, unit * u, boolean move_on_land)
 					move(r, uf, true);
 				}
 			}
-			if (*up==u) up = &u->next;
+			if (*up==uf) up = &ue->next;
 		}
 	}
 }
diff --git a/src/common/modules/gmcmd.c b/src/common/modules/gmcmd.c
index 45efb68da..ef100901b 100644
--- a/src/common/modules/gmcmd.c
+++ b/src/common/modules/gmcmd.c
@@ -181,8 +181,11 @@ init_gmcmd(void)
 		if (f) {
 			attrib * a = a_find(f->attribs, &at_permissions);
 			if (!a) {
+				item_type * itype;
 				a = a_add(&f->attribs, a_new(&at_permissions));
-				a_add((attrib**)&a->data.v, make_atgmcreate(&it_demonseye));
+				for (itype=itemtypes;itype;itype=itype->next) {
+					a_add((attrib**)&a->data.v, make_atgmcreate(itype));
+				}
 				a_add((attrib**)&a->data.v, make_key(atoi36("gmtf")));
 			}
 		}