--- deliantra/server/common/object.C	2007/01/18 19:42:09	1.118
+++ deliantra/server/common/object.C	2007/01/21 21:28:27	1.120
@@ -672,6 +672,9 @@
 
 object::~object ()
 {
+  if (index)
+    unlink ();
+
   free_key_values (this);
 }
 
@@ -1748,7 +1751,7 @@
             {
 
               float
-                diff = tmp->move_slow_penalty * FABS (op->speed);
+                diff = tmp->move_slow_penalty * fabs (op->speed);
 
               if (op->type == PLAYER)
                 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||