Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 10418)
+++ /trunk/data/validator/combinations.mapcss	(revision 10419)
@@ -368,8 +368,8 @@
 
 /* #9182 */
-way[waterway][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered!=yes][pipeline!=yes][location!=underground][eval(waylength()) > 400] {
-  throwWarning: tr("Long waterway with negative {0} but without a {1} tag. Remove {0} or add a {1} tag if applicable. Also check crossing bridges and their {0} tags.", "{1.key}", "{2.key}");
-}
-way[waterway][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered!=yes][pipeline!=yes][location!=underground][eval(waylength()) < 400] {
-  throwOther: tr("Short waterway with negative {0} but without a {1} tag. Remove {0} or add a {1} tag if applicable. Also check crossing bridges and their {0} tags.", "{1.key}", "{2.key}");
-}
+way[waterway][layer][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered!=yes][pipeline!=yes][location!=underground][eval(waylength()) > 400] {
+  throwWarning: tr("Long waterway with {0} but without a tag which defines it as tunnel or underground. Remove {1} or add a tunnel tag if applicable. Also check crossing bridges and their {1} tags.", "{1.tag}", "{1.key}");
+}
+way[waterway][layer][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered!=yes][pipeline!=yes][location!=underground][eval(waylength()) <= 400] {
+  throwOther: tr("Short waterway with {0} but without a tag which defines it as tunnel or underground. Remove {1} or add a tunnel tag if applicable. Also check crossing bridges and their {1} tags.", "{1.tag}", "{1.key}");
+}
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 10418)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 10419)
@@ -1713,5 +1713,5 @@
 }
 node[leisure=firepit] { 
-    icon-image: "leisure/firepit.svg"; 
+    icon-image: "leisure/firepit.svg";
     set icon_z17;
 }
@@ -2474,5 +2474,5 @@
 }
 node[amenity=shower] { 
-    icon-image: "service/shower.svg"; 
+    icon-image: "service/shower.svg";
     set icon_z17;
 }
@@ -4061,5 +4061,5 @@
     fill-color: water#0000ff;
 }
-way[natural=water][intermittent=yes] {
+area[natural=water][intermittent=yes] {
     width: 2;
     dashes: 15, 5;
@@ -4070,5 +4070,5 @@
     right-casing-color: water#0000ff;
     right-casing-width: 5;
-    right-casing-opacity: 0.30; 
+    right-casing-opacity: 0.30;
 }
 area[natural=mud] {
@@ -4176,5 +4176,5 @@
 }
 way[waterway=river][intermittent=yes],
-way[waterway=riverbank][intermittent=yes],
+area[waterway=riverbank][intermittent=yes],
 way[waterway=canal][intermittent=yes],
 way[waterway=stream][intermittent=yes],