diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c
index e8f39b4a8..984b2a5ef 100644
--- a/src/common/kernel/save.c
+++ b/src/common/kernel/save.c
@@ -536,9 +536,18 @@ factionorders(void)
   char b[16];
   char * fid = strnzcpy(b, getstrtoken(), 15);
   const char * pass = getstrtoken();
-  faction *f;
-  
+  faction *f = NULL;
+
+#ifdef FUZZY_BASE36
+  int id = atoi36(fid);
+  if (id!=0) f = findfaction(id);
+  if (f==NULL) {
+    id = atoi(fid);
+    if (id!=0) f = findfaction(id);
+  }
+#else  
   f = findfaction(atoi36(fid));
+#endif
   
   if (f!=NULL) {
     /* Kontrolliere, ob das Passwort richtig eingegeben wurde. Es
diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h
index 5f18eb286..86df008da 100644
--- a/src/common/settings-eressea.h
+++ b/src/common/settings-eressea.h
@@ -45,3 +45,4 @@
 #define WORMHOLE_MODULE
 #define XECMD_MODULE
 
+#define FUZZY_BASE36
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 13e71aa9a..25983f1bd 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -7018,12 +7018,12 @@ sp_break_curse(castorder *co)
       remove_curse(ap, c);
 
       ADDMSG(&mage->faction->msgs, msg_message(
-        "destroy_magic_effect", "unit region command id target",
+        "destroy_curse_effect", "unit region command id target",
         mage, mage->region, co->order, strdup(pa->param[1]->data.s),
         strdup(ts)));
     } else {
       ADDMSG(&mage->faction->msgs, msg_message(
-        "destroy_magic_noeffect", "unit region command",
+        "destroy_curse_noeffect", "unit region command",
         mage, mage->region, co->order));
     }
   }
diff --git a/src/scripts/eressea.lua b/src/scripts/eressea.lua
index e96ec27ab..af6bda9d2 100644
--- a/src/scripts/eressea.lua
+++ b/src/scripts/eressea.lua
@@ -74,8 +74,8 @@ function process(orders)
   plan_monsters()
 
   local nmrs = get_nmrs(1)
-  if nmrs >= 70 then
-    print("Shit. More than 70 factions with 1 NMR (" .. nmrs .. ")")
+  if nmrs >= 80 then
+    print("Shit. More than 80 factions with 1 NMR (" .. nmrs .. ")")
     write_summary()
     return -1
   end