diff --git a/data/core/units/dunefolk/Falconer.cfg b/data/core/units/dunefolk/Falconer.cfg
index 516906a9eb2f..c45878c6c903 100644
--- a/data/core/units/dunefolk/Falconer.cfg
+++ b/data/core/units/dunefolk/Falconer.cfg
@@ -7,7 +7,8 @@ units/dunefolk/skirmisher/#enddef
     [filter]
         status=diversion
         #    ability_type_active=resistance # this does not work, in this case.  Only works if ability affects_self=yes
-[/filter]#enddef
+    [/filter]
+#enddef
 
 [unit_type]
     id=Dune Falconer
diff --git a/data/core/units/dunefolk/Sky_Hunter.cfg b/data/core/units/dunefolk/Sky_Hunter.cfg
index 8205d765d84d..e46ca1648d54 100644
--- a/data/core/units/dunefolk/Sky_Hunter.cfg
+++ b/data/core/units/dunefolk/Sky_Hunter.cfg
@@ -6,7 +6,8 @@ units/dunefolk/skirmisher/#enddef
 #define DIVERSION_ANIM_FILTER
     [filter]
         status=diversion
-[/filter]#enddef
+    [/filter]
+#enddef
 
 [unit_type]
     id=Dune Sky Hunter
diff --git a/data/scenario-test.cfg b/data/scenario-test.cfg
index 611bd0f82f71..4ced9f6def64 100644
--- a/data/scenario-test.cfg
+++ b/data/scenario-test.cfg
@@ -4336,7 +4336,8 @@ unplagueable: $wml_unit.status.unplagueable"
                 [message]
                     speaker=narrator
                     image=wesnoth-icon.png
-                    message="Single-dimensional [store_locations] is broken, as $x_len does not equal $xy_len|. See bug #21488"
+                    # wmlindent cannot handle '#21488' in a string so we write 'Nr. 21488'
+                    message="Single-dimensional [store_locations] is broken, as $x_len does not equal $xy_len|. See bug Nr. 21488 "
                 [/message]
             [/then]
         [/if]
@@ -4357,13 +4358,13 @@ unplagueable: $wml_unit.status.unplagueable"
         [/filter]
 
         [filter_second]
-           type=Lich
+            type=Lich
         [/filter_second]
 
-	[store_unit]
+        [store_unit]
             [filter]
-               id=$unit.id
-               side=1
+                id=$unit.id
+                side=1
             [/filter]
             variable=store_cth
             kill=yes
@@ -4373,7 +4374,7 @@ unplagueable: $wml_unit.status.unplagueable"
     [event]
         name=turn 2
 
-	[unstore_unit]
+        [unstore_unit]
             variable=store_cth
             find_vacant=no
             advance=false