diff --git a/src/mbgl/gl/drawable_gl.cpp b/src/mbgl/gl/drawable_gl.cpp
index 314243ff0..fdc9e3f39 100644
--- a/src/mbgl/gl/drawable_gl.cpp
+++ b/src/mbgl/gl/drawable_gl.cpp
@@ -122,10 +122,10 @@ void DrawableGL::bindUniformBuffers() const {
             const auto& uniformBuffer = getUniformBuffers().get(element.first);
             if (!uniformBuffer) {
                 using namespace std::string_literals;
-                const auto tileID = getTileID() ? util::toString(*getTileID()) : "<no tile>";
+                const auto tileIDStr = getTileID() ? util::toString(*getTileID()) : "<no tile>";
                 Log::Error(Event::General,
                            "bindUniformBuffers: UBO "s + std::string(StringIndexer::get(element.first)) +
-                               " not found for " + util::toString(getID()) + " / " + getName() + " / " + tileID +
+                               " not found for " + util::toString(getID()) + " / " + getName() + " / " + tileIDStr +
                                ". skipping.");
                 assert(false);
                 continue;
diff --git a/src/mbgl/gl/enum.cpp b/src/mbgl/gl/enum.cpp
index 58dc1e656..d59306c4f 100644
--- a/src/mbgl/gl/enum.cpp
+++ b/src/mbgl/gl/enum.cpp
@@ -397,6 +397,7 @@ platform::GLenum Enum<gfx::TexturePixelType>::sizedFor<>(const gfx::TexturePixel
                 default:
                     break;
             }
+            break;
         }
         case gfx::TextureChannelDataType::Float: {
             switch (value) {