diff --git a/platform/darwin/src/NSValue+MLNStyleAttributeAdditions.mm b/platform/darwin/src/NSValue+MLNStyleAttributeAdditions.mm
index 0082846de..f7b01a998 100644
--- a/platform/darwin/src/NSValue+MLNStyleAttributeAdditions.mm
+++ b/platform/darwin/src/NSValue+MLNStyleAttributeAdditions.mm
@@ -23,9 +23,9 @@
   // Foundation defines padding in counterclockwise order: top, left, bottom, right.
   MLNEdgeInsets insets = {
       .top = paddingArray[0],
-      .right = paddingArray[1],
-      .bottom = paddingArray[2],
       .left = paddingArray[3],
+      .bottom = paddingArray[2],
+      .right = paddingArray[1],
   };
   return [NSValue value:&insets withObjCType:@encode(MLNEdgeInsets)];
 }
diff --git a/platform/macos/src/MLNMapView.mm b/platform/macos/src/MLNMapView.mm
index 4726b1f8c..9ce4674c4 100644
--- a/platform/macos/src/MLNMapView.mm
+++ b/platform/macos/src/MLNMapView.mm
@@ -24,6 +24,8 @@
 #import "MLNPolyline.h"
 #import "MLNSettings.h"
 
+#include <optional>
+
 #import <mbgl/annotation/annotation.hpp>
 #import <mbgl/map/camera.hpp>
 #import <mbgl/map/map.hpp>
@@ -317,8 +319,9 @@ public:
 
   MLNRendererConfiguration *config = [MLNRendererConfiguration currentConfiguration];
 
-  auto localFontFamilyName =
-      config.localFontFamilyName ? std::string(config.localFontFamilyName.UTF8String) : nullptr;
+  std::optional<std::string> localFontFamilyName =
+      config.localFontFamilyName ? std::optional(std::string(config.localFontFamilyName.UTF8String))
+                                 : std::nullopt;
   auto renderer = std::make_unique<mbgl::Renderer>(_mbglView->getRendererBackend(),
                                                    config.scaleFactor, localFontFamilyName);
   BOOL enableCrossSourceCollisions = !config.perSourceCollisions;