diff --git a/res/eressea/equipment.xml b/res/eressea/equipment.xml
index 2a39a5295..306187c2f 100644
--- a/res/eressea/equipment.xml
+++ b/res/eressea/equipment.xml
@@ -1,20 +1,6 @@
 <?xml version="1.0"?>
 <eressea><equipment>
 
-  <set name="spo_dragon">
-    <item name="dragonblood" amount="4"/>
-    <item name="dragonhead" amount="1"/>
-  </set>
-
-  <set name="spo_youngdragon">
-    <item name="dragonblood" amount="1"/>
-  </set>
-
-  <set name="spo_wyrm">
-    <item name="dragonblood" amount="10"/>
-    <item name="dragonhead" amount="1"/>
-  </set>
-
   <!-- sets that are used by the monster-spawning code -->
   <set name="seed_dragon">
     <skill name="magic" level="4"/>
diff --git a/scripts/eressea/e2/init.lua b/scripts/eressea/e2/init.lua
index 4ef2212c0..93dbfeea9 100644
--- a/scripts/eressea/e2/init.lua
+++ b/scripts/eressea/e2/init.lua
@@ -14,6 +14,29 @@ local sets = {
             ['dragonblood'] = 6,
             ['seaserpenthead'] = 1
         }
+    },
+    ['spo_dragon'] = {
+        ['items'] = {
+            ['dragonblood'] = 4,
+            ['seaserpenthead'] = 1
+        }
+    },
+    ['spo_dragon'] = {
+        ['items'] = {
+            ['dragonblood'] = 4,
+            ['dragonhead'] = 1
+        }
+    },
+    ['spo_youngdragon'] = {
+        ['items'] = {
+            ['dragonblood'] = 1
+        }
+    },
+    ['spo_wyrm'] = {
+        ['items'] = {
+            ['dragonblood'] = 10,
+            ['dragonhead'] = 1
+        }
     }
 }
 equipment.add_multiple(sets)
diff --git a/src/randenc.c b/src/randenc.c
index a55f2c445..7de49b9e2 100644
--- a/src/randenc.c
+++ b/src/randenc.c
@@ -155,19 +155,6 @@ static void dissolve_units(void)
     remove_empty_units();
 }
 
-static bool improve_all(faction * f, skill_t sk, int by_weeks)
-{
-    unit *u;
-    bool result = false;
-    for (u = f->units; u; u = u->nextF) {
-        if (has_skill(u, sk)) {
-            increase_skill(u, sk, by_weeks);
-            result = true;
-        }
-    }
-    return result;
-}
-
 void drown(region * r)
 {
     if (fval(r->terrain, SEA_REGION)) {
diff --git a/src/tests.c b/src/tests.c
index e3799c1b5..336cb5231 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -257,6 +257,7 @@ void test_setup_test(CuTest *tc, const char *file, int line) {
     else {
         log_debug("start test in %s:%d", file, line);
     }
+    errno = 0;
 }
 
 void test_teardown(void)