diff --git a/include/mbgl/renderer/layer_group.hpp b/include/mbgl/renderer/layer_group.hpp
index 6806c8e8b..38e72124b 100644
--- a/include/mbgl/renderer/layer_group.hpp
+++ b/include/mbgl/renderer/layer_group.hpp
@@ -39,7 +39,7 @@ protected:
 public:
     LayerGroupBase(const LayerGroupBase&) = delete;
     LayerGroupBase& operator=(const LayerGroupBase&) = delete;
-    virtual ~LayerGroupBase() = default;
+    ~LayerGroupBase() override = default;
 
     /// Whether the drawables should be drawn
     bool getEnabled() const { return enabled; }
diff --git a/src/mbgl/renderer/possibly_evaluated_property_value.hpp b/src/mbgl/renderer/possibly_evaluated_property_value.hpp
index 49a8aa529..a7c948a68 100644
--- a/src/mbgl/renderer/possibly_evaluated_property_value.hpp
+++ b/src/mbgl/renderer/possibly_evaluated_property_value.hpp
@@ -25,7 +25,7 @@ public:
 
     std::optional<T> constant() const {
         return value.match([&](const T& t) { return std::optional<T>(t); },
-                           [&](const auto&) { return std::optional<T>(); });
+                           [&](const auto&) { return std::optional<T>{}; });
     }
 
     T constantOr(const T& t) const { return constant().value_or(t); }