diff --git a/circle.yml b/circle.yml
index 977d138127f..106d1eed9ee 100644
--- a/circle.yml
+++ b/circle.yml
@@ -191,8 +191,7 @@ workflows:
 executors:
   ubuntu-eoan:
     docker:
-      # FIXME: Move the image to mbgl/
-      - image: tmpsantos/mbgl_ci:1.9
+      - image: mbxci/gl-native:c1ff30af1934135723b4ccb3ab97c2b68c0ef980
     resource_class: xlarge
     working_directory: /src
     environment:
diff --git a/include/mbgl/util/indexed_tuple.hpp b/include/mbgl/util/indexed_tuple.hpp
index 99d73d1e198..0241b8d79af 100644
--- a/include/mbgl/util/indexed_tuple.hpp
+++ b/include/mbgl/util/indexed_tuple.hpp
@@ -30,12 +30,20 @@ class IndexedTuple<TypeList<Is...>, TypeList<Ts...>> : public std::tuple<Ts...>
 
     template <class I>
     auto& get() {
+#if _WIN32
         return std::get<TypeIndex<I, Is...>::value, Ts...>(*this);
+#else
+        return std::get<TypeIndex<I, Is...>::value>(*this);
+#endif
     }
 
     template <class I>
     const auto& get() const {
+#if _WIN32
         return std::get<TypeIndex<I, Is...>::value, Ts...>(*this);
+#else
+        return std::get<TypeIndex<I, Is...>::value>(*this);
+#endif
     }
 
     template <class... Us>
diff --git a/platform/node/CMakeLists.txt b/platform/node/CMakeLists.txt
index 1369ab2d33e..8f1d967c535 100644
--- a/platform/node/CMakeLists.txt
+++ b/platform/node/CMakeLists.txt
@@ -20,6 +20,7 @@ add_node_module(
         72
         79
         83
+        88
 )
 
 target_sources(
diff --git a/src/mbgl/style/expression/within.cpp b/src/mbgl/style/expression/within.cpp
index 2b8a6a65bf3..b66015465f2 100644
--- a/src/mbgl/style/expression/within.cpp
+++ b/src/mbgl/style/expression/within.cpp
@@ -39,7 +39,7 @@ Polygon<int64_t> getTilePolygon(const Polygon<double>& polygon,
     for (const auto& ring : polygon) {
         LinearRing<int64_t> temp;
         temp.reserve(ring.size());
-        for (const auto p : ring) {
+        for (const auto& p : ring) {
             const auto coord = latLonToTileCoodinates(p, canonical);
             temp.push_back(coord);
             updateBBox(bbox, coord);
diff --git a/src/mbgl/tile/geometry_tile_data.cpp b/src/mbgl/tile/geometry_tile_data.cpp
index 472b07739b3..c7be54d8243 100644
--- a/src/mbgl/tile/geometry_tile_data.cpp
+++ b/src/mbgl/tile/geometry_tile_data.cpp
@@ -198,7 +198,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
         [&](const MultiPoint<double>& points) -> GeometryCollection {
             MultiPoint<int16_t> result;
             result.reserve(points.size());
-            for (const auto p : points) {
+            for (const auto& p : points) {
                 result.emplace_back(latLonToTileCoodinates(p));
             }
             return {std::move(result)};
@@ -206,7 +206,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
         [&](const LineString<double>& lineString) -> GeometryCollection {
             LineString<int16_t> result;
             result.reserve(lineString.size());
-            for (const auto p : lineString) {
+            for (const auto& p : lineString) {
                 result.emplace_back(latLonToTileCoodinates(p));
             }
             return {std::move(result)};
@@ -217,7 +217,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
             for (const auto& line : lineStrings) {
                 LineString<int16_t> temp;
                 temp.reserve(line.size());
-                for (const auto p : line) {
+                for (const auto& p : line) {
                     temp.emplace_back(latLonToTileCoodinates(p));
                 }
                 result.emplace_back(temp);
@@ -230,7 +230,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
             for (const auto& ring : polygon) {
                 LinearRing<int16_t> temp;
                 temp.reserve(ring.size());
-                for (const auto p : ring) {
+                for (const auto& p : ring) {
                     temp.emplace_back(latLonToTileCoodinates(p));
                 }
                 result.emplace_back(temp);
@@ -244,7 +244,7 @@ GeometryCollection convertGeometry(const Feature::geometry_type& geometryTileFea
                 for (const auto& r : pg) {
                     LinearRing<int16_t> ring;
                     ring.reserve(r.size());
-                    for (const auto p : r) {
+                    for (const auto& p : r) {
                         ring.emplace_back(latLonToTileCoodinates(p));
                     }
                     result.emplace_back(ring);