diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index 65ba9b113..4f0b59b12 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -80,9 +80,9 @@
 #include <attributes/targetregion.h>
 #include <attributes/key.h>
 
-#undef  XMAS1999
-#undef  XMAS2000
-#undef  XMAS2001
+#undef XMAS1999
+#undef XMAS2000
+#undef XMAS2001
 #undef XMAS2002
 
 extern void reorder_owners(struct region * r);
@@ -1161,9 +1161,48 @@ check_phoenix(void)
 }
 #endif
 
+static void
+fix_dissolve(unit * u, int value, char mode)
+{
+  attrib * a = a_find(u->attribs, &at_unitdissolve);
+  if (a!=NULL) return;
+  a = a_add(&u->attribs, a_new(&at_unitdissolve));
+  a->data.ca[0] = mode;
+  a->data.ca[1] = (char)value;
+  log_warning(("unit %s has race %s and no dissolve-attrib\n", unitname(u), rc_name(u->race, 0)));
+}
+
+static void
+check_dissolve(void)
+{
+  region * r;
+  for (r=regions;r!=NULL;r=r->next) {
+    unit * u;
+    for (u=r->units;u!=NULL;u=u->next) {
+      if (u->race==new_race[RC_STONEGOLEM]) {
+        fix_dissolve(u, STONEGOLEM_CRUMBLE, 0);
+        continue;
+      } 
+      if (u->race==new_race[RC_IRONGOLEM]) {
+        fix_dissolve(u, IRONGOLEM_CRUMBLE, 0);
+        continue;
+      } 
+      if (u->race==new_race[RC_PEASANT]) {
+        fix_dissolve(u, 15, 1);
+        continue;
+      }
+      if (u->race==new_race[RC_TREEMAN]) {
+        fix_dissolve(u, 5, 2);
+        continue;
+      }
+    }
+  }
+}
+
 void
 korrektur(void)
 {
+  check_dissolve();
 	french_testers();
 #if TEST_LOCALES
 	setup_locales();
@@ -1171,9 +1210,6 @@ korrektur(void)
 	fix_astralplane();
 	fix_firewalls();
 	fix_gates();
-#ifdef TEST_GM_COMMANDS
-	setup_gm_faction();
-#endif
 	update_gms();
 	verify_owners(false);
 	/* fix_herbtypes(); */
@@ -1213,36 +1249,11 @@ korrektur(void)
 #endif
 
 	if (global.data_version<TYPES_VERSION) fix_icastles();
-#ifdef XMAS2000
-	santa_comes_to_town();
-#endif
 #ifdef FUZZY_BASE36
 	enable_fuzzy = true;
 #endif
 }
 
-int
-astral_penger(void)
-{
-	plane * astralplane = getplanebyname("Astralraum");
-	region * r;
-	const item_type * itype = it_find("money");
-	assert(itype);
-	for (r=regions;r;r=r->next) {
-		unit * u;
-		if (rplane(r)!=astralplane) continue;
-		for (u=r->units;u;u=u->next) freset(u->faction, FL_DH);
-		for (u=r->units;u;u=u->next) {
-			if (u->faction->no==MONSTER_FACTION) continue;
-			if (!fval(u->faction, FL_DH)) {
-				fset(u->faction, FL_DH);
-				i_change(&u->items, itype, 300);
-			}
-		}
-	}
-	return 0;
-}
-
 void
 korrektur_end(void)
 {
diff --git a/src/res/races.xml b/src/res/races.xml
index 1e569d894..9dba5adee 100644
--- a/src/res/races.xml
+++ b/src/res/races.xml
@@ -627,13 +627,13 @@
 		<attack type="4" damage="2d3"></attack>
 		<attack type="3" damage="1d1"></attack>
 	</race>
-	<race name="stone golem" magres="0.250000" maxaura="1.000000" regaura="0.100000" recruitcost="5000" maintenance="0" weight="10000" capacity="2000" speed="1.000000" hp="60" ac="4" damage="2d12+6" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk nolearn noteach giveitem giveperson>
+	<race name="stone golem" magres="0.250000" maxaura="1.000000" regaura="0.100000" recruitcost="5000" maintenance="0" weight="10000" capacity="2000" speed="1.000000" hp="60" ac="4" damage="2d12+6" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk nolearn noteach giveitem>
 		<ai splitsize="50"></ai>
 		<skill name="sk_building" modifier="14"></skill>
 		<skill name="sk_roadwork" modifier="14"></skill>
 		<attack type="4" damage="2d10+4"></attack>
 	</race>
-	<race name="irongolem" magres="0.250000" maxaura="1.000000" regaura="0.100000" recruitcost="5000" maintenance="0" weight="10000" capacity="2000" speed="1.000000" hp="50" ac="2" damage="2d10+4" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk nolearn noteach giveitem giveperson>
+	<race name="irongolem" magres="0.250000" maxaura="1.000000" regaura="0.100000" recruitcost="5000" maintenance="0" weight="10000" capacity="2000" speed="1.000000" hp="50" ac="2" damage="2d10+4" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="2" walk nolearn noteach giveitem>
 		<ai splitsize="50"></ai>
 		<skill name="sk_armorer" modifier="14"></skill>
 		<skill name="sk_weaponsmithing" modifier="14"></skill>