diff --git a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/AnimatedCurrentLocationViewController.swift b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/AnimatedCurrentLocationViewController.swift
index a24448eb..bc99b8ec 100755
--- a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/AnimatedCurrentLocationViewController.swift
+++ b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/AnimatedCurrentLocationViewController.swift
@@ -70,7 +70,7 @@ final class AnimatedCurrentLocationViewController: UIViewController {
   }
 }
 
-extension AnimatedCurrentLocationViewController: CLLocationManagerDelegate {
+extension AnimatedCurrentLocationViewController: @MainActor CLLocationManagerDelegate {
   func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
     if locationManager.authorizationStatus == .denied {
       print("Please authorize location services")
diff --git a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/CustomIndoorViewController.swift b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/CustomIndoorViewController.swift
index 08adf22c..d4effd85 100755
--- a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/CustomIndoorViewController.swift
+++ b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/CustomIndoorViewController.swift
@@ -64,7 +64,7 @@ class CustomIndoorViewController: UIViewController {
 
 }
 
-extension CustomIndoorViewController: GMSIndoorDisplayDelegate {
+extension CustomIndoorViewController: @MainActor GMSIndoorDisplayDelegate {
 
   func didChangeActiveBuilding(_ building: GMSIndoorBuilding?) {
     guard let building = building else {
diff --git a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingBasicViewController.swift b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingBasicViewController.swift
index 1416baf6..63a3eaca 100755
--- a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingBasicViewController.swift
+++ b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingBasicViewController.swift
@@ -32,6 +32,7 @@ private struct FeatureLayerConfig {
   let highlightPlaceID: String
 }
 
+@MainActor
 private class SliderControls {
   let view: UIStackView
   let fillColor: UISlider
@@ -39,6 +40,7 @@ private class SliderControls {
   let strokeWidth: UISlider
   let label: UILabel
 
+  @MainActor
   private static func addSliderAndLabel(to parent: UIStackView, text: String, initialValue: Float)
     -> UISlider
   {
diff --git a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingSearchViewController.swift b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingSearchViewController.swift
index aca15fe1..f5c1f7ad 100755
--- a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingSearchViewController.swift
+++ b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingSearchViewController.swift
@@ -50,6 +50,7 @@ private struct PlaceTextSearchResponse: Codable {
   let places: [Place]
 }
 
+@MainActor
 private class PlaceLookupController: NSObject {
   let serial: Int
   let controller: DataDrivenStylingSearchViewController