diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index a16ad5eb3..5673f9b7b 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -1131,9 +1131,11 @@ quit_cmd(unit * u, struct order * ord)
     }
     fset(f, FFL_QUIT);
   } else {
+    char buffer[64];
+    write_order(ord, buffer, sizeof(buffer));
     cmistake(u, ord, 86, MSG_EVENT);
-    log_warning(("STIRB mit falschem Passwort für Partei %s: %s\n",
-      factionid(f), passwd));
+    log_warning(("QUIT with illegal password for faction %s: %s\n",
+      factionid(f), buffer));
   }
   return 0;
 }
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 06643ed8a..b39d1ac6b 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -1358,8 +1358,8 @@ terminate(troop dt, troop at, int type, const char *damage, boolean missile)
 #endif
 
   if (bdebug) {
-    fprintf(bdebug, "Damage %d, armor %d: %d -> %d HP, tot.\n",
-      da, ar, df->person[dt.index].hp, df->person[dt.index].hp - rda);
+    fprintf(bdebug, "Damage %d, armor %d, type %d: %d -> %d HP, tot.\n",
+      da, ar, type, df->person[dt.index].hp + rda, df->person[dt.index].hp);
   }
   for (pitm=&du->items; *pitm; pitm=&(*pitm)->next) {
     const item_type * itype = (*pitm)->type;