diff --git a/src/common/kernel/race.h b/src/common/kernel/race.h
index 1546b4180..53d00dac5 100644
--- a/src/common/kernel/race.h
+++ b/src/common/kernel/race.h
@@ -32,8 +32,8 @@
 #define AT_COMBATSPELL 7
 #define AT_STRUCTURAL 8
 
-#define GOLEM_IRON   4          /* Anzahl Eisen in einem Eisengolem */
-#define GOLEM_STONE  4          /* Anzahl Steine in einem Steingolem */
+#define GOLEM_IRON   4 /* Anzahl Eisen in einem Eisengolem */
+#define GOLEM_STONE  4 /* Anzahl Steine in einem Steingolem */
 
 typedef struct att {
 	int type;
diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c
index 1d69cb562..7698ac10d 100644
--- a/src/common/kernel/spell.c
+++ b/src/common/kernel/spell.c
@@ -1193,7 +1193,7 @@ sp_hain(castorder *co)
 		return 0;
 	}
 
-	trees = lovar(force * 10) + force;
+	trees = lovar(force * 10 * RESOURCE_QUANTITY) + force;
 #if GROWING_TREES
 	rsettrees(r, 1, rtrees(r,1) + trees);
 #else
@@ -1240,7 +1240,7 @@ sp_mallornhain(castorder *co)
 		return 0;
 	}
 
-	trees = lovar(force * 10) + force;
+	trees = lovar(force * 10 * RESOURCE_QUANTITY) + force;
 #if GROWING_TREES
 	rsettrees(r, 1, rtrees(r,1) + trees);
 #else
@@ -1532,7 +1532,7 @@ sp_create_irongolem(castorder *co)
 		return 0;
 	}
 
-	u2 = create_unit(r, mage->faction, force*8, new_race[RC_IRONGOLEM], 0,
+	u2 = create_unit(r, mage->faction, max(1,force*8*RESOURCE_QUANTITY), new_race[RC_IRONGOLEM], 0,
 		LOC(mage->faction->locale, rc_name(new_race[RC_IRONGOLEM], 1)), mage);
 
 	set_level(u2, SK_ARMORER, 1);
@@ -1593,7 +1593,7 @@ sp_create_stonegolem(castorder *co)
 		return 0;
 	}
 
-	u2 = create_unit(r, mage->faction, force*5, new_race[RC_STONEGOLEM], 0,
+	u2 = create_unit(r, mage->faction, max(1,force*5*RESOURCE_QUANTITY), new_race[RC_STONEGOLEM], 0,
 		LOC(mage->faction->locale, rc_name(new_race[RC_STONEGOLEM], 1)), mage);
 	set_level(u2, SK_ROAD_BUILDING, 1);
 	set_level(u2, SK_BUILDING, 1);