diff --git a/src/common/kernel/reports.c b/src/common/kernel/reports.c
index 452393312..cece01f13 100644
--- a/src/common/kernel/reports.c
+++ b/src/common/kernel/reports.c
@@ -261,7 +261,7 @@ bufunit(const faction * f, const unit * u, int indent, int mode)
 
   pzTmp = get_racename(u->attribs);
   if (pzTmp) {
-    scat(pzTmp);
+    bufp += strlcpy(bufp, pzTmp, sizeof(buf)-(bufp-buf));
     if (u->faction==f && fval(u->race, RCF_SHAPESHIFTANY)) {
       bufp += strlcpy(bufp, " (", sizeof(buf)-(bufp-buf));
       bufp += strlcpy(bufp, racename(f->locale, u, u->race), sizeof(buf)-(bufp-buf));
diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index ef9450e0e..dabc88225 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -287,7 +287,7 @@ parse_buildings(xmlDocPtr doc)
       property = xmlGetProp(node, BAD_CAST "type");
       assert(property!=NULL);
       mt->rtype = rt_find((const char*)property);
-	  assert(mt->rtype!=NULL);
+      assert(mt->rtype!=NULL);
       xmlFree(property);
 
       if (xml_bvalue(node, "variable", false)) mt->flags |= MTF_VARIABLE;
@@ -1054,7 +1054,7 @@ parse_messages(xmlDocPtr doc)
       xmlChar * text;
 
       xml_readtext(node, &lang, &text);
-	  xml_cleanup_string(text);
+      xml_cleanup_string(text);
       nrt_register(mtype, lang, xml_to_locale(text), 0, (const char*)section);
       xmlFree(text);