diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index 4442f1aa2..755a527e6 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -864,19 +864,17 @@ cr_output_unit(FILE * F, const region * r,
 		}
 		fprintf(F, "%d;%s\n", in, add_translation(ic, locale_string(f->locale, ic)));
 	}
-    if (show!=u->items) {
-	/* free the temporary items */
-	while (show) {
-	    item * ishow = show;
-	    show = show->next;
-	    i_free(ishow);
-	}
+  if (show!=u->items) {
+    /* free the temporary items */
+    while (show) {
+      i_free(i_remove(&show, show));
     }
+  }
     
-	if ((u->faction == f || omniscient(f)) && u->botschaften)
-		cr_output_str_list(F, "EINHEITSBOTSCHAFTEN", u->botschaften, f);
-
-	print_curses(F, f, u, TYP_UNIT);
+  if ((u->faction == f || omniscient(f)) && u->botschaften)
+      cr_output_str_list(F, "EINHEITSBOTSCHAFTEN", u->botschaften, f);
+  
+  print_curses(F, f, u, TYP_UNIT);
 }
 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =  */
 
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 1c1c98060..bf81c2909 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -2832,7 +2832,7 @@ reports(void)
     if (f->no != MONSTER_FACTION) {
       int error = write_reports(f, ltime);
       if (error) retval = error;
-      if (!nosh && f->email && BAT) {
+      if (f->email && BAT) {
         sprintf(buf, "%s/%s.sh", reportpath(), factionid(f));
         shfp = fopen(buf, "w");
         fprintf(shfp,"#!/bin/sh\n\nPATH=%s\n\n",MailitPath());