diff --git a/layers/landcover/landcover.yaml b/layers/landcover/landcover.yaml
index ed9f0f7a..ca876dba 100644
--- a/layers/landcover/landcover.yaml
+++ b/layers/landcover/landcover.yaml
@@ -2,7 +2,11 @@ layer:
   id: "landcover"
   requires:
     tables:
+      - ne_10m_antarctic_ice_shelves_polys
+      - ne_10m_glaciated_areas
       - ne_50m_antarctic_ice_shelves_polys
+      - ne_50m_glaciated_areas
+      - ne_110m_glaciated_areas
   description: |
       Landcover is used to describe the physical material at the surface of the earth. At lower zoom levels this is
       from Natural Earth data for glaciers and ice shelves and at higher zoom levels the landcover is [implied by OSM tags](http://wiki.openstreetmap.org/wiki/Landcover). The most common use case for this layer
diff --git a/layers/mountain_peak/mountain_peak.yaml b/layers/mountain_peak/mountain_peak.yaml
index 8ac09e33..a7c52db8 100644
--- a/layers/mountain_peak/mountain_peak.yaml
+++ b/layers/mountain_peak/mountain_peak.yaml
@@ -1,5 +1,8 @@
 layer:
   id: "mountain_peak"
+  requires:
+    tables:
+      - ne_10m_admin_0_countries
   description: |
       [Natural peaks](http://wiki.openstreetmap.org/wiki/Tag:natural%3Dpeak)
   buffer_size: 64
diff --git a/layers/place/place.yaml b/layers/place/place.yaml
index 9e7b46af..0d0a335e 100644
--- a/layers/place/place.yaml
+++ b/layers/place/place.yaml
@@ -4,7 +4,7 @@ layer:
     tables:
       - ne_10m_admin_1_states_provinces
       - ne_10m_admin_0_countries
-      - ne_10m_admin_1_states_provinces
+      - ne_10m_populated_places
   description: |
       The place layer consists out of [countries](http://wiki.openstreetmap.org/wiki/Tag:place%3Dcountry),
       [states](http://wiki.openstreetmap.org/wiki/Tag:place%3Dstate), [cities](http://wiki.openstreetmap.org/wiki/Key:place)
diff --git a/layers/water/water.yaml b/layers/water/water.yaml
index 15672e98..8b76a705 100644
--- a/layers/water/water.yaml
+++ b/layers/water/water.yaml
@@ -2,6 +2,12 @@ layer:
   id: "water"
   requires:
     tables:
+      - ne_10m_lakes
+      - ne_10m_ocean
+      - ne_110m_lakes
+      - ne_110m_ocean
+      - ne_50m_lakes
+      - ne_50m_ocean
       - osm_ocean_polygon
   description: |
       Water polygons representing oceans and lakes. Covered watered areas are excluded (`covered=yes`).
diff --git a/layers/waterway/waterway.yaml b/layers/waterway/waterway.yaml
index 63e6c4f1..53ec3bce 100644
--- a/layers/waterway/waterway.yaml
+++ b/layers/waterway/waterway.yaml
@@ -4,6 +4,9 @@ layer:
   requires:
     layers:
       - water
+    tables:
+      - ne_110m_rivers_lake_centerlines
+      - ne_50m_rivers_lake_centerlines
   description: |
       OpenStreetMap [waterways](https://wiki.openstreetmap.org/wiki/Waterways) for higher zoom levels (z9 and more)
       and Natural Earth rivers and lake centerlines for low zoom levels (z3 - z8).