--- deliantra/server/common/player.C	2008/09/09 10:51:59	1.44
+++ deliantra/server/common/player.C	2008/09/29 09:04:50	1.46
@@ -261,7 +261,7 @@
   LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
 
   if (pl->ob)
-    pl->ob->destroy ();
+    pl->ob->destroy (true);
 
   pl->destroy ();
 
@@ -423,7 +423,7 @@
 
                 case 'G': // gender
                   {
-                    expand_cfpod (pl, nest, cfpod, end);
+                    cfpod = expand_cfpod (pl, nest, cfpod, end);
                     nest << '\0'; // zero-terminate
 
                     const char *str = nest.linearise ();
@@ -431,7 +431,7 @@
 
                     if (sep)
                       {
-                        if (pl->gender || 1)
+                        if (pl->gender)
                           buf.add (sep + 1, nest.size () - (sep - str) - 2);
                         else
                           buf.add (str, sep - str);