diff --git a/bootstrap.sh b/bootstrap.sh
index fd877a644..26b2200d7 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -10,7 +10,7 @@ todo
 - shrink icu data
 '
 
-MASON_VERSION="b709931"
+MASON_VERSION="better-linking"
 
 function setup_mason() {
     if [[ ! -d ./.mason ]]; then
@@ -29,7 +29,6 @@ function install() {
     MASON_PLATFORM_ID=$(mason env MASON_PLATFORM_ID)
     if [[ ! -d ./mason_packages/${MASON_PLATFORM_ID}/${1}/${2} ]]; then
         mason install $1 $2
-        mason link $1 $2
         if [[ ${3:-false} != false ]]; then
             LA_FILE=$(mason prefix $1 $2)/lib/$3.la
             if [[ -f ${LA_FILE} ]]; then
@@ -39,6 +38,7 @@ function install() {
             fi
         fi
     fi
+    mason link $1 $2
 }
 
 ICU_VERSION="55.1"
diff --git a/src/renderer_common/render_group_symbolizer.cpp b/src/renderer_common/render_group_symbolizer.cpp
index 8e6fc8dc4..b427b2b95 100644
--- a/src/renderer_common/render_group_symbolizer.cpp
+++ b/src/renderer_common/render_group_symbolizer.cpp
@@ -119,7 +119,7 @@ void render_group_symbolizer(group_symbolizer const& sym,
         // symbolizers with avoid-edges set: only the avoid-edges of
         // the group symbolizer itself should matter.
         geometry::point<double> origin_pt(x,y);
-        sub_feature->set_geometry(std::move(origin_pt));
+        sub_feature->set_geometry(mapnik::geometry::geometry<double>(std::move(origin_pt)));
         // get the layout for this set of properties
         for (auto const& rule : props->get_rules())
         {