--- deliantra/server/common/loader.C	2006/09/04 16:46:32	1.5
+++ deliantra/server/common/loader.C	2006/09/04 17:34:50	1.7
@@ -559,7 +559,9 @@
                   if (tmp->arch)
                     {
                       // was: insert_ob_in_ob (tmp, op);
-                      // but manually addint it can improve map loading times a lot
+                      // but manually adding it can improve map loading times a lot
+                      CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
+                      CLEAR_FLAG (tmp, FLAG_REMOVED);
                       tmp->env = op;
 
                       if (!op->inv)
@@ -1023,8 +1025,8 @@
             break;
 
           default:
-            printf ("kw abort %s\n", keyword_str [kw]);//D
-            abort ();
+            LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str [kw]);
+            break;
         }
     }
 }