diff --git a/include/mbgl/map/map_observer.hpp b/include/mbgl/map/map_observer.hpp
index 49b5ffcf3df..4c9170fc18e 100644
--- a/include/mbgl/map/map_observer.hpp
+++ b/include/mbgl/map/map_observer.hpp
@@ -70,7 +70,7 @@ class MapObserver {
     virtual bool onCanRemoveUnusedStyleImage(const std::string&) { return true; }
     // Observe this event to easily mutate or observe shaders as soon
     // as the registry becomes available.
-    virtual void onRegisterShaders(gfx::ShaderRegistry&) {};
+    virtual void onRegisterShaders(gfx::ShaderRegistry&) {}
 
     // Shaders compilation
     virtual void onPreCompileShader(shaders::BuiltIn, gfx::Backend::Type, const std::string&) {}
diff --git a/include/mbgl/renderer/renderer_observer.hpp b/include/mbgl/renderer/renderer_observer.hpp
index 8d56e0fdc90..5df817afa43 100644
--- a/include/mbgl/renderer/renderer_observer.hpp
+++ b/include/mbgl/renderer/renderer_observer.hpp
@@ -61,9 +61,9 @@ class RendererObserver {
 
     // Entry point for custom shader registration
     virtual void onRegisterShaders(gfx::ShaderRegistry&) {};
-    virtual void onPreCompileShader(shaders::BuiltIn, gfx::Backend::Type, const std::string&) {};
-    virtual void onPostCompileShader(shaders::BuiltIn, gfx::Backend::Type, const std::string&) {};
-    virtual void onShaderCompileFailed(shaders::BuiltIn, gfx::Backend::Type, const std::string&) {};
+    virtual void onPreCompileShader(shaders::BuiltIn, gfx::Backend::Type, const std::string&) {}
+    virtual void onPostCompileShader(shaders::BuiltIn, gfx::Backend::Type, const std::string&) {}
+    virtual void onShaderCompileFailed(shaders::BuiltIn, gfx::Backend::Type, const std::string&) {}
 
     // Glyph loading
     virtual void onGlyphsLoaded(const FontStack&, const GlyphRange&) {}
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index d43196dfbb5..3219be7ed67 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -325,6 +325,14 @@ void GeometryTile::onLayout(std::shared_ptr<LayoutResult> result, const uint64_t
 
     observer->onTileChanged(*this);
 
+    if (layoutResult) {
+        for (const auto& data : layoutResult->layerRenderData) {
+            if (data.second.bucket) {
+                data.second.bucket->check(SYM_GUARD_LOC);
+            }
+        }
+    }
+    
     if (!pending) {
         observer->onTileAction(id, sourceID, TileOperation::EndParse);
     }