diff --git a/amenity-symbols.mss b/amenity-symbols.mss
index 42fb95490a..fd8aa4f649 100644
--- a/amenity-symbols.mss
+++ b/amenity-symbols.mss
@@ -26,13 +26,13 @@
 
   [aeroway = 'aerodrome'][zoom >= 10][zoom < 13]::aeroway {
     [zoom < 11] {
-      point-file: url('symbols/aerodrom.p.16.png');
+      point-file: url('symbols/aerodrome.p.16.png');
       text-dy: -12;
     }
     text-name: "[name]";
     text-size: 8;
     text-fill: #6692da;
-    text-face-name: oblique-fonts;
+    text-face-name: @oblique-fonts;
     text-halo-radius: 1;
     text-placement: interior;
   }
@@ -52,27 +52,27 @@
 
   [natural = 'peak'][zoom >= 11]::natural {
     point-file: url('symbols/peak.png');
-    placement: interior;
+    point-placement: interior;
   }
 
   [natural = 'volcano'][zoom >= 11]::natural {
     point-file: url('symbols/volcano.png');
-    placement: interior;
+    point-placement: interior;
   }
 
   [natural = 'cave_entrance'][zoom >= 15]::natural {
     point-file: url('symbols/poi_cave.p.16.png');
-    placement: interior;
+    point-placement: interior;
   }
 
   [natural = 'spring'][zoom >= 14]::natural {
     point-file: url('symbols/spring.png');
-    placement: interior;
+    point-placement: interior;
   }
 
   [natural = 'tree'][zoom >= 16]::natural {
     point-file: url('symbols/tree.png');
-    point-ignore-placment: true;
+    point-ignore-placement: true;
     point-placement: interior;
     [zoom >= 17] {
       point-file: url('symbols/tree2.png');
@@ -113,12 +113,14 @@
 
   [barrier = 'lift_gate'][zoom >= 16]::barrier {
     point-file: url('symbols/liftgate.png');
-    placement: interior;
+    point-placement: interior;
   }
 
   [barrier = 'bollard'],
   [barrier = 'block'] {
-    point-file: url('symbols/bollard.png');
-    placement: interior;
+    [zoom >= 16] {
+      point-file: url('symbols/bollard.png');
+      point-placement: interior;
+    }
   }
 }
diff --git a/other.mss b/other.mss
index d2559096cd..24df79ecec 100644
--- a/other.mss
+++ b/other.mss
@@ -2601,7 +2601,10 @@
     [zoom >= 5][zoom < 12] {
       line-width: 0.4;
       line-color: #a9dba9;
-      [zoom >= 7] { line-width: 1; }
+      [zoom >= 7] {
+        line-width: 1;
+        line-color: #97d397;
+      }
       [zoom >= 9] { line-width: 2; }
       [zoom >= 11] { line-width: 2.5; }
     }
@@ -2739,7 +2742,7 @@
     }
   }
 
-  [highway = 'trunk'][zoom >= 10][zoom < 13] {
+  [highway = 'trunk'][zoom >= 11][zoom < 13] {
     shield-name: "[ref]";
     shield-size: 10;
     shield-fill: #fff;
diff --git a/project.mml b/project.mml
index 10fd25f0bf..43a3261071 100644
--- a/project.mml
+++ b/project.mml
@@ -1668,7 +1668,7 @@
         "dbname": "gis"
       },
       "id": "amenity-symbols",
-      "class": "",
+      "class": "symbols",
       "srs-name": "900913",
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "advanced": {},
@@ -1690,7 +1690,7 @@
         "dbname": "gis"
       },
       "id": "amenity-symbols-poly",
-      "class": "",
+      "class": "symbols",
       "srs-name": "900913",
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "advanced": {},