diff --git a/Source/Marker Data/Marker Data/Models/Color Swatch/ColorsExtractorService/DeltaEFormulaExtension.swift b/Source/Marker Data/Marker Data/Models/Color Swatch/ColorsExtractorService/DeltaEFormulaExtension.swift
index 66dfa9f..9c3a63d 100644
--- a/Source/Marker Data/Marker Data/Models/Color Swatch/ColorsExtractorService/DeltaEFormulaExtension.swift	
+++ b/Source/Marker Data/Marker Data/Models/Color Swatch/ColorsExtractorService/DeltaEFormulaExtension.swift	
@@ -26,7 +26,7 @@ extension DeltaEFormula {
     }
 }
 
-extension DeltaEFormula: CustomStringConvertible {
+extension DeltaEFormula: @retroactive CustomStringConvertible {
     public var description: String {
         switch self {
         case .euclidean:
diff --git a/Source/Marker Data/Marker Data/Models/Extract/Extraction Model/ExtractionModel_DropDelegate.swift b/Source/Marker Data/Marker Data/Models/Extract/Extraction Model/ExtractionModel_DropDelegate.swift
index 1cecd9d..8cf14c0 100644
--- a/Source/Marker Data/Marker Data/Models/Extract/Extraction Model/ExtractionModel_DropDelegate.swift	
+++ b/Source/Marker Data/Marker Data/Models/Extract/Extraction Model/ExtractionModel_DropDelegate.swift	
@@ -18,8 +18,7 @@ extension ExtractionModel: DropDelegate {
             DropProposal(operation: .forbidden)
         }
     }
-    
-    @MainActor
+
     func performDrop(info: DropInfo) -> Bool {
         let providers = info.itemProviders(
             for: [.fileURL]
diff --git a/Source/Marker Data/Marker Data/Models/Roles/RolesManager+DropDelegate.swift b/Source/Marker Data/Marker Data/Models/Roles/RolesManager+DropDelegate.swift
index 4766105..730d29a 100644
--- a/Source/Marker Data/Marker Data/Models/Roles/RolesManager+DropDelegate.swift	
+++ b/Source/Marker Data/Marker Data/Models/Roles/RolesManager+DropDelegate.swift	
@@ -44,7 +44,7 @@ extension RolesManager: DropDelegate {
             if provider.canLoadObject(ofClass: URL.self) {
                 // Load the file URL from the provider
                 let _ = provider.loadObject(ofClass: URL.self) { url, error in
-                    Task {
+                    Task { @MainActor in
                         defer {
                             self.loadingInProgress = false
                         }
diff --git a/Source/Marker Data/Marker Data/Views/Main/ContentView.swift b/Source/Marker Data/Marker Data/Views/Main/ContentView.swift
index f3c839e..a0d560e 100644
--- a/Source/Marker Data/Marker Data/Views/Main/ContentView.swift	
+++ b/Source/Marker Data/Marker Data/Views/Main/ContentView.swift	
@@ -134,6 +134,7 @@ struct ContentView: View {
     }
 }
 
+#if compiler(>=6)
 #Preview {
     @StateObject var settings = SettingsContainer()
     @StateObject var databaseManager = DatabaseManager(settings: settings)
@@ -156,3 +157,4 @@ struct ContentView: View {
     )
     .environmentObject(settings)
 }
+#endif
diff --git a/Source/Marker Data/Workflow Extension/WorkflowExtensionView.swift b/Source/Marker Data/Workflow Extension/WorkflowExtensionView.swift
index 82ad5cc..01910e5 100644
--- a/Source/Marker Data/Workflow Extension/WorkflowExtensionView.swift	
+++ b/Source/Marker Data/Workflow Extension/WorkflowExtensionView.swift	
@@ -79,7 +79,9 @@ struct WorkflowExtensionView: View {
         .onDrop(of: [.fcpxml], isTargeted: nil) { providers -> Bool in
             for provider in providers {
                 _ = provider.loadDataRepresentation(for: .fcpxml) { data, error in
-                    self.handleDrop(data: data)
+                    Task { @MainActor in
+                        self.handleDrop(data: data)
+                    }
                 }
             }
             return true