diff --git a/binaries/data/mods/public/simulation/templates/formations/column_closed.xml b/binaries/data/mods/public/simulation/templates/formations/column_closed.xml
index 4af265486c..e0a104d313 100644
--- a/binaries/data/mods/public/simulation/templates/formations/column_closed.xml
+++ b/binaries/data/mods/public/simulation/templates/formations/column_closed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_formation">
-<Formation>
+  <Formation>
     <Icon>formations/column_closed.png</Icon>
     <FormationName>Forced March</FormationName>
     <UnitSeparationWidthMultiplier>0.75</UnitSeparationWidthMultiplier>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
index 8e028d59d9..bed34c148f 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
@@ -28,14 +28,6 @@
       <trained>actor/fauna/animal/peacock_call.xml</trained>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed>2.0</WalkSpeed>
-    <Run>
-      <Speed>5.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <UnitAI>
     <NaturalBehaviour>domestic</NaturalBehaviour>
     <RoamDistance>4.0</RoamDistance>
@@ -45,6 +37,14 @@
     <FeedTimeMin>10000</FeedTimeMin>
     <FeedTimeMax>40000</FeedTimeMax>
   </UnitAI>
+  <UnitMotion>
+    <WalkSpeed>2.0</WalkSpeed>
+    <Run>
+      <Speed>5.0</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/peacock.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml b/binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml
index 55a4e06409..dc9ab63e76 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml
@@ -7,16 +7,16 @@
       <wood>225</wood>
     </Resources>
   </Cost>
-  <Identity>
-    <GenericName>Apartment Building</GenericName>
-    <SpecificName>?</SpecificName>
-  </Identity>
   <GarrisonHolder>
     <Max>9</Max>
   </GarrisonHolder>
   <Health>
     <Max>1500</Max>
   </Health>
+  <Identity>
+    <GenericName>Apartment Building</GenericName>
+    <SpecificName>?</SpecificName>
+  </Identity>
   <Loot>
     <wood>30</wood>
   </Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild.xml
index 65038c1c55..96727e2af1 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
-</Entity>
+<Entity parent="template_unit_fauna"/>