Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9047)
+++ trunk/data/defaultpresets.xml	(revision 9048)
@@ -5956,5 +5956,5 @@
             <reference ref="aerodrome" />
         </item>
-        <item name="Barracks" type="closedway" preset_name_label="true">
+        <item name="Barracks" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=barracks" />
             <space />
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 9047)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 9048)
@@ -1400,4 +1400,9 @@
     width: 2;
     color: pipeline#660000;
+}
+node[pipeline=marker] {
+    icon-image: "misc/pipeline_marker.svg";
+    set icon_z17;
+    text: auto;
 }
 node[man_made=breakwater],
@@ -3513,5 +3518,5 @@
     dashes: 9,9;
 }
-node[aeroway=aerodrome] {
+node[aeroway=aerodrome][military!=airfield] {
     icon-image: "transport/airport.png";
     set icon_z17;