diff --git a/Mac/MainWindow/Timeline/ArticlePasteboardWriter.swift b/Mac/MainWindow/Timeline/ArticlePasteboardWriter.swift
index 4dd5b80d5..29be01571 100644
--- a/Mac/MainWindow/Timeline/ArticlePasteboardWriter.swift
+++ b/Mac/MainWindow/Timeline/ArticlePasteboardWriter.swift
@@ -10,7 +10,7 @@ import AppKit
 import Articles
 import RSCore
 
-extension Article: PasteboardWriterOwner {
+extension Article: @retroactive PasteboardWriterOwner {
 	public var pasteboardWriter: NSPasteboardWriting {
 		return ArticlePasteboardWriter(article: self)
 	}
diff --git a/Mac/Preferences/Accounts/AddAccountsView.swift b/Mac/Preferences/Accounts/AddAccountsView.swift
index 6fc31957d..c8a496ad2 100644
--- a/Mac/Preferences/Accounts/AddAccountsView.swift
+++ b/Mac/Preferences/Accounts/AddAccountsView.swift
@@ -222,7 +222,7 @@ struct AddAccountsView: View {
 				.padding(.top, 8)
 			
 			HStack {
-				ForEach(0..<chunkedWebAccounts().count, content: { chunk in
+				ForEach(0..<chunkedWebAccounts().count, id: \.self, content: { chunk in
 					VStack {
 						Picker(selection: $selectedAccount, label: Text(""), content: {
 							ForEach(chunkedWebAccounts()[chunk], id: \.self, content: { account in
diff --git a/Mac/Preferences/General/GeneralPrefencesViewController.swift b/Mac/Preferences/General/GeneralPrefencesViewController.swift
index 19fa9b7a0..7fb93a71a 100644
--- a/Mac/Preferences/General/GeneralPrefencesViewController.swift
+++ b/Mac/Preferences/General/GeneralPrefencesViewController.swift
@@ -10,6 +10,7 @@ import AppKit
 import RSCore
 import RSWeb
 import UserNotifications
+import UniformTypeIdentifiers
 
 final class GeneralPreferencesViewController: NSViewController {
 
@@ -125,7 +126,7 @@ private extension GeneralPreferencesViewController {
 			let item = NSMenuItem(title: name, action: nil, keyEquivalent: "")
 			item.representedObject = browser.bundleIdentifier
 
-			let icon = browser.icon ?? NSWorkspace.shared.icon(forFileType: kUTTypeApplicationBundle as String)
+			let icon = browser.icon ?? NSWorkspace.shared.icon(for: UTType.applicationBundle)
 			icon.size = NSSize(width: 16.0, height: 16.0)
 			item.image = browser.icon
 			menu.addItem(item)
diff --git a/Modules/RSCore/Sources/RSCore/AppKit/KeyboardDelegateProtocol.swift b/Modules/RSCore/Sources/RSCore/AppKit/KeyboardDelegateProtocol.swift
index 15339e3ed..ccfbe7fa2 100644
--- a/Modules/RSCore/Sources/RSCore/AppKit/KeyboardDelegateProtocol.swift
+++ b/Modules/RSCore/Sources/RSCore/AppKit/KeyboardDelegateProtocol.swift
@@ -10,7 +10,7 @@ import AppKit
 
 //let keypadEnter: unichar = 3
 
-@objc public protocol KeyboardDelegate: class {
+@objc public protocol KeyboardDelegate: AnyObject {
 	
 	// Return true if handled.
 	func keydown(_: NSEvent, in view: NSView) -> Bool
diff --git a/Modules/RSCore/Sources/RSCore/Shared/MainThreadOperation.swift b/Modules/RSCore/Sources/RSCore/Shared/MainThreadOperation.swift
index 5f6fd5d0c..92a4f97c3 100644
--- a/Modules/RSCore/Sources/RSCore/Shared/MainThreadOperation.swift
+++ b/Modules/RSCore/Sources/RSCore/Shared/MainThreadOperation.swift
@@ -15,7 +15,7 @@ import Foundation
 /// When it’s canceled, it should do its best to stop
 /// doing whatever it’s doing. However, it should not
 /// leave data in an inconsistent state.
-public protocol MainThreadOperation: class {
+public protocol MainThreadOperation: AnyObject {
 
 	// These three properties are set by MainThreadOperationQueue. Don’t set them.
 	var isCanceled: Bool { get set } // Check this at appropriate times in case the operation has been canceled.
diff --git a/Modules/RSCore/Sources/RSCore/Shared/MainThreadOperationQueue.swift b/Modules/RSCore/Sources/RSCore/Shared/MainThreadOperationQueue.swift
index 36455586e..be7d225dd 100644
--- a/Modules/RSCore/Sources/RSCore/Shared/MainThreadOperationQueue.swift
+++ b/Modules/RSCore/Sources/RSCore/Shared/MainThreadOperationQueue.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol MainThreadOperationDelegate: class {
+public protocol MainThreadOperationDelegate: AnyObject {
 	func operationDidComplete(_ operation: MainThreadOperation)
 	func cancelOperation(_ operation: MainThreadOperation)
 	func make(_ childOperation: MainThreadOperation, dependOn parentOperation: MainThreadOperation)
diff --git a/Modules/RSCore/Sources/RSCore/Shared/UndoableCommand.swift b/Modules/RSCore/Sources/RSCore/Shared/UndoableCommand.swift
index 1a79051b5..5594151ff 100644
--- a/Modules/RSCore/Sources/RSCore/Shared/UndoableCommand.swift
+++ b/Modules/RSCore/Sources/RSCore/Shared/UndoableCommand.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol UndoableCommand: class {
+public protocol UndoableCommand: AnyObject {
 
 	var undoActionName: String { get }
 	var redoActionName: String { get }
@@ -39,7 +39,7 @@ extension UndoableCommand {
 
 // Useful for view controllers.
 
-public protocol UndoableCommandRunner: class {
+public protocol UndoableCommandRunner: AnyObject {
     
     var undoableCommands: [UndoableCommand] { get set }
     var undoManager: UndoManager? { get }