diff --git a/include/mbgl/mtl/renderer_backend.hpp b/include/mbgl/mtl/renderer_backend.hpp
index fe7abb18b..1859de16f 100644
--- a/include/mbgl/mtl/renderer_backend.hpp
+++ b/include/mbgl/mtl/renderer_backend.hpp
@@ -32,7 +32,7 @@ public:
 
     const MTLDevicePtr& getDevice() const { return device; }
     const MTLCommandQueuePtr& getCommandQueue() const { return commandQueue; }
-    const bool isBaseVertexInstanceDrawingSupported() const { return baseVertexInstanceDrawingSupported; }
+    bool isBaseVertexInstanceDrawingSupported() const { return baseVertexInstanceDrawingSupported; }
 
 protected:
     std::unique_ptr<gfx::Context> createContext() override;
diff --git a/src/mbgl/gfx/stencil_mode.hpp b/src/mbgl/gfx/stencil_mode.hpp
index 0ccf21fae..92d2265e8 100644
--- a/src/mbgl/gfx/stencil_mode.hpp
+++ b/src/mbgl/gfx/stencil_mode.hpp
@@ -44,14 +44,5 @@ public:
     }
 };
 
-template <StencilFunctionType F>
-constexpr StencilFunctionType StencilMode::SimpleTest<F>::func;
-
-template <StencilFunctionType F>
-constexpr uint32_t StencilMode::SimpleTest<F>::mask;
-
-template <StencilFunctionType F>
-constexpr StencilFunctionType StencilMode::MaskedTest<F>::func;
-
 } // namespace gfx
 } // namespace mbgl