diff --git a/src/res/messages.xml b/src/res/messages.xml
index c980b11a0..822973dbf 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -2691,8 +2691,8 @@
       <arg name="faction" type="int"/>
       <arg name="password" type="string"/>
     </type>
-    <text locale="de">"ERESSEA $atoi36($faction) \"${password}\" - Deine Befehle hatten ein falsches Passwort."</text>
-    <text locale="en">"ERESSEA $atoi36($faction) \"${password}\" - Your orders had the wrong password."</text>
+    <text locale="de">"ERESSEA $int36($faction) \"${password}\" - Deine Befehle hatten ein falsches Passwort."</text>
+    <text locale="en">"ERESSEA $int36($faction) \"${password}\" - Your orders had the wrong password."</text>
   </message>
   <message name="changepasswd" section="events">
     <type>
@@ -5533,8 +5533,8 @@
       <arg name="target" type="unit"/>
       <arg name="race" type="race"/>
     </type>
-    <text locale="de">"$unit($mage) läßt $unit($target) als $race($race,$unit.number($target)) erscheinen."</text>
-    <text locale="en">"$unit($mage) makes $unit($target) appear as $race($race,$unit.number($target))."</text>
+    <text locale="de">"$unit($mage) läßt $unit($target) als $race($race,$unit.size($target)) erscheinen."</text>
+    <text locale="en">"$unit($mage) makes $unit($target) appear as $race($race,$unit.size($target))."</text>
   </message>
 
   <message name="magicresistance_effect" section="events">
diff --git a/src/scripts/eressea/xmas2006.lua b/src/scripts/eressea/xmas2006.lua
index 0ac10541e..9f9d5195b 100644
--- a/src/scripts/eressea/xmas2006.lua
+++ b/src/scripts/eressea/xmas2006.lua
@@ -9,12 +9,14 @@ function use_xmastree(u, amount)
 end
 
 function update_xmas2006()
-  if get_season() == "winter" then
+  season = get_season()
+  if season == "calendar::winter" then
+    print("it is " .. season .. ", the christmas trees do their magic")
     msg = message("xmastree_effect")
     for r in regions() do
       if r:get_key("xm06") then
         trees = r:get_resource("tree")
-        if trees>0 then
+        if trees*0.1>1 then
           r:set_resource("tree", trees * 1.1)
           msg:send_region(r)
         end