diff --git a/WORKSPACE b/WORKSPACE
index 89e67366b..06455395c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -56,4 +56,4 @@ load(
 
 provisioning_profile_repository(
     name = "local_provisioning_profiles"
-)
\ No newline at end of file
+)
diff --git a/include/mbgl/gfx/vertex_attribute.hpp b/include/mbgl/gfx/vertex_attribute.hpp
index ecc1cab35..e2e828618 100644
--- a/include/mbgl/gfx/vertex_attribute.hpp
+++ b/include/mbgl/gfx/vertex_attribute.hpp
@@ -437,4 +437,4 @@ protected:
 };
 
 } // namespace gfx
-} // namespace mbgl
\ No newline at end of file
+} // namespace mbgl
diff --git a/platform/BUILD.bazel b/platform/BUILD.bazel
index 98c9a00c5..d1c837070 100644
--- a/platform/BUILD.bazel
+++ b/platform/BUILD.bazel
@@ -56,7 +56,7 @@ objc_library(
     hdrs = [
         "//platform/darwin:include/mbgl/util/image+MLNAdditions.hpp",
     ],
-    copts = WARNING_FLAGS + MAPLIBRE_FLAGS + [
+    copts = WARNING_FLAGS["ios"] + MAPLIBRE_FLAGS + [
         "-fmodules",
         "-Wno-gnu-zero-variadic-macro-arguments",
         "-Wno-variadic-macros",
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
index 6f22eed8a..6440487da 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
+++ b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro
@@ -20,4 +20,4 @@
 -dontwarn org.conscrypt.*
 -dontwarn org.openjsse.javax.net.ssl.SSLParameters
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
\ No newline at end of file
+-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/platform/darwin/BUILD.bazel b/platform/darwin/BUILD.bazel
index 9edb00f88..699b82dbd 100644
--- a/platform/darwin/BUILD.bazel
+++ b/platform/darwin/BUILD.bazel
@@ -135,7 +135,7 @@ objc_library(
         ],
         allow_empty = False,
     ),
-    copts = MAPLIBRE_FLAGS + WARNING_FLAGS,
+    copts = MAPLIBRE_FLAGS + WARNING_FLAGS["ios"],
     data = glob(
         [
             "test/Media.xcassets/**",
@@ -166,7 +166,7 @@ objc_library(
             "test/MLNOfflineStorageTests.mm",
         ],
     ),
-    copts = CPP_FLAGS + MAPLIBRE_FLAGS + WARNING_FLAGS + ["-Wno-deprecated-declarations"],
+    copts = CPP_FLAGS + MAPLIBRE_FLAGS + WARNING_FLAGS["ios"] + ["-Wno-deprecated-declarations"],
     visibility = [
         "//platform/ios/test:__pkg__",
     ],
diff --git a/platform/ios/scripts/bazel-generate-plists.sh b/platform/ios/scripts/bazel-generate-plists.sh
index f4daba7b8..b25aef515 100644
--- a/platform/ios/scripts/bazel-generate-plists.sh
+++ b/platform/ios/scripts/bazel-generate-plists.sh
@@ -53,9 +53,9 @@ if [ ! -d platform/ios/build ]; then
    mkdir platform/ios/build
 fi
 
-cp platform/ios/platform/ios/framework/Info-static.plist "$temp_info_static_plist"
-cp platform/ios/platform/ios/framework/Info.plist "$temp_info_plist"
-cp platform/ios/platform/ios/app/Info.plist "$temp_app_info_plist"
+cp platform/ios/framework/Info-static.plist "$temp_info_static_plist"
+cp platform/ios/framework/Info.plist "$temp_info_plist"
+cp platform/ios/app/Info.plist "$temp_app_info_plist"
 
 # Replace semver and hash
 plutil -replace MLNSemanticVersionString -string "$sem_version" "$temp_info_static_plist"
diff --git a/platform/ios/scripts/bazel-package.sh b/platform/ios/scripts/bazel-package.sh
index 9142d1ffb..43e5a1df8 100644
--- a/platform/ios/scripts/bazel-package.sh
+++ b/platform/ios/scripts/bazel-package.sh
@@ -2,8 +2,6 @@
 
 set -eo pipefail
 
-pushd ../../../../../
-
 # "static" or "dynamic"
 build_type="static"
 
@@ -19,9 +17,6 @@ hash=$(git log | head -1 | awk '{ print $2 }' | cut -c 1-10) && true
 
 args=("--sem-ver" "$sem_version" "--hash" "$hash")
 
-# Provisioning profile name/UUID
-uuid="iOS Team Provisioning Profile: *"
-
 while [[ $# -gt 0 ]]; do
    case $1 in
    --static)
@@ -85,7 +80,7 @@ if [ ! -d platform/ios/build ]; then
    mkdir platform/ios/build
 fi
 
-bash "platform/ios/platform/ios/scripts/bazel-generate-plists.sh" "${args[@]}"
+bash "platform/ios/scripts/bazel-generate-plists.sh" "${args[@]}"
 
 echo "------ Building Maplibre version: $sem_version hash: $hash ------"
 
diff --git a/platform/ios/scripts/bazel-xcodeproj.sh b/platform/ios/scripts/bazel-xcodeproj.sh
index 82aa718f8..e03a02566 100644
--- a/platform/ios/scripts/bazel-xcodeproj.sh
+++ b/platform/ios/scripts/bazel-xcodeproj.sh
@@ -45,7 +45,7 @@ while [[ $# -gt 0 ]]; do
    esac
 done
 
-bash "platform/ios/platform/ios/scripts/bazel-generate-plists.sh" "${args[@]}"
+bash "platform/ios/scripts/bazel-generate-plists.sh" "${args[@]}"
 
 echo "------ Building Maplibre version: $sem_version hash: $hash ------"
 
@@ -53,5 +53,3 @@ echo "------ Building Maplibre version: $sem_version hash: $hash ------"
 # Example invocation: ./bazel-xcodeproj.sh flavor split teamid 1234567890
 # Find your team ID inside a .mobileprovision file or in your keychain (Apple development: your@email -> Get Info -> Organizational Unit)
 bazel run //platform/ios:xcodeproj --@rules_xcodeproj//xcodeproj:extra_common_flags="--//:renderer=$flavor --//:maplibre_platform=ios"
-
-popd
diff --git a/src/mbgl/gfx/vertex_buffer.hpp b/src/mbgl/gfx/vertex_buffer.hpp
index c14f5f34f..031410faf 100644
--- a/src/mbgl/gfx/vertex_buffer.hpp
+++ b/src/mbgl/gfx/vertex_buffer.hpp
@@ -16,14 +16,15 @@ public:
 
 using UniqueVertexBufferResource = std::unique_ptr<VertexBufferResource>;
 
-// This class has a template argument that we use to specify the vertex type. It is not used by
-// the implementation, but serves type checking purposes during build time.
+// This class has a template argument that we use to specify the vertex type. It
+// is not used by the implementation, but serves type checking purposes during
+// build time.
 template <class>
 class VertexBuffer {
 public:
     VertexBuffer(const std::size_t elements_, UniqueVertexBufferResource&& resource_)
-        : elements(elements_), resource(std::move(resource_)) {
-    }
+        : elements(elements_),
+          resource(std::move(resource_)) {}
 
     std::size_t elements;
 
diff --git a/src/mbgl/gl/vertex_array.hpp b/src/mbgl/gl/vertex_array.hpp
index 02cb05d08..0179664e5 100644
--- a/src/mbgl/gl/vertex_array.hpp
+++ b/src/mbgl/gl/vertex_array.hpp
@@ -57,11 +57,9 @@ using UniqueVertexArrayState = std::unique_ptr<VertexArrayState, VertexArrayStat
 class VertexArray {
 public:
     VertexArray(UniqueVertexArrayState state_)
-        : state(std::move(state_)) {
-    }
+        : state(std::move(state_)) {}
     VertexArray(VertexArray&& other)
-        : state(std::move(other.state)) {
-    }
+        : state(std::move(other.state)) {}
 
     void bind(Context&, const gfx::IndexBuffer&, const AttributeBindingArray&);
 
diff --git a/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp
index 4eb043f7b..a60ff5d9e 100644
--- a/src/mbgl/renderer/render_orchestrator.cpp
+++ b/src/mbgl/renderer/render_orchestrator.cpp
@@ -931,9 +931,13 @@ void RenderOrchestrator::observeRenderTargets(std::function<void(const RenderTar
 }
 #endif // MLN_DRAWABLE_RENDERER
 
-void RenderOrchestrator::onGlyphsError(const FontStack& fontStack, const GlyphRange& glyphRange, std::exception_ptr error) {
-    Log::Error(Event::Style, "Failed to load glyph range " + std::to_string(glyphRange.first) + "-" + std::to_string(glyphRange.second) +
-               " for font stack " + fontStackToString(fontStack) + ": " + util::toString(error));
+void RenderOrchestrator::onGlyphsError(const FontStack& fontStack,
+                                       const GlyphRange& glyphRange,
+                                       std::exception_ptr error) {
+    Log::Error(Event::Style,
+               "Failed to load glyph range " + std::to_string(glyphRange.first) + "-" +
+                   std::to_string(glyphRange.second) + " for font stack " + fontStackToString(fontStack) + ": " +
+                   util::toString(error));
     observer->onResourceError(error);
 }
 
diff --git a/src/mbgl/renderer/render_orchestrator.hpp b/src/mbgl/renderer/render_orchestrator.hpp
index 7c1753356..830db2fb9 100644
--- a/src/mbgl/renderer/render_orchestrator.hpp
+++ b/src/mbgl/renderer/render_orchestrator.hpp
@@ -53,9 +53,7 @@ class LayerProperties;
 
 using ImmutableLayer = Immutable<style::Layer::Impl>;
 
-class RenderOrchestrator final : public GlyphManagerObserver,
-                                 public ImageManagerObserver,
-                                 public RenderSourceObserver {
+class RenderOrchestrator final : public GlyphManagerObserver, public ImageManagerObserver, public RenderSourceObserver {
 public:
     RenderOrchestrator(bool backgroundLayerAsColor_, const std::optional<std::string>& localFontFamily_);
     ~RenderOrchestrator() override;