diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c
index f844bcf47..592fa6cb0 100644
--- a/src/common/gamecode/economy.c
+++ b/src/common/gamecode/economy.c
@@ -744,7 +744,7 @@ giveunit(region * r, unit * u, unit * u2, strlist * S)
 		strlist * o = u->orders;
 		u->orders = o->next;
 		gc_add(o->s); /* delete it later */
-		free(o);
+		o->s = NULL;
 	}
 }
 
diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c
index 5c981ae27..6714e8fb6 100644
--- a/src/common/kernel/save.c
+++ b/src/common/kernel/save.c
@@ -599,10 +599,11 @@ typus2race(unsigned char typus)
 }
 
 boolean
-is_persistent(const char *s, const struct locale *lang) 
+is_persistent(const char *s, const struct locale *lang)
 {
+	if (s==NULL) return false;
 #ifdef AT_PERSISTENT                                                          
-	if(*s == '@') return true;                                                  
+	if(*s == '@') return true;
 #endif      /* Nur kurze Befehle! */
 	switch(igetkeyword(s, lang)) {
 		case K_BUY:
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index b635a0993..8d8778a0b 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -1968,21 +1968,6 @@ fix_herbs(void)
 	}
 }
 
-#if 0
-#include <modules/gmcmd.h>
-#include <attributes/gm.h>
-void setup_gm_faction(void);
-static void
-set_atgm(faction * f)
-{
-	plane * p = planes;
-	if (!f) return;
-	while (p) {
-		a_add(&f->attribs, make_gm(p));
-		p = p->next;
-	}
-}
-#endif
 
 #include <event.h>
 #include <triggers/timeout.h>
diff --git a/src/mapper/Makefile b/src/mapper/Makefile
index 9016773ea..96ee7760c 100644
--- a/src/mapper/Makefile
+++ b/src/mapper/Makefile
@@ -14,7 +14,8 @@ INCLUDES  += \
 	-I../common/util \
 	-I../common/kernel \
 	-I../common/spells \
-	-I../common
+	-I../common \
+	-I..
 
 LIBS      += \
 	-le-modules \
@@ -26,6 +27,7 @@ LIBS      += \
 	-le-attributes \
 	-le-util \
 	-lm
+
 ifeq ($(NCURSES), 1)
  LIBS += -lncurses
 else
diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c
index 780c3372e..3afa0ae51 100644
--- a/src/mapper/mapper.c
+++ b/src/mapper/mapper.c
@@ -34,6 +34,7 @@
 
 #include <item.h>
 #include <faction.h>
+#include <race.h>
 #include <region.h>
 #include <reports.h>
 #include <save.h>
@@ -1303,11 +1304,14 @@ main(int argc, char *argv[])
 	kernel_init();
 
 	init_triggers();
+
+	debug_language("locales.log");
+	init_locales();
+
+	init_races();
 	init_attributes();
 	init_spells();
-
 	init_resources();
-	/* init_weapons(); */
 	init_items();
 
 	init_museum();