diff --git a/Tusker/Screens/Account Follows/AccountFollowsListViewController.swift b/Tusker/Screens/Account Follows/AccountFollowsListViewController.swift
index f211bbfdd4..04fc93006f 100644
--- a/Tusker/Screens/Account Follows/AccountFollowsListViewController.swift	
+++ b/Tusker/Screens/Account Follows/AccountFollowsListViewController.swift	
@@ -11,7 +11,7 @@ import Pachyderm
 
 class AccountFollowsListViewController: UIViewController, CollectionViewController {
     
-    private static let pageSize = 40
+    private static nonisolated let pageSize = 40
     
     let accountID: String
     let mastodonController: MastodonController
diff --git a/Tusker/Views/AccountDisplayNameView.swift b/Tusker/Views/AccountDisplayNameView.swift
index 22e3effda9..b089900ba0 100644
--- a/Tusker/Views/AccountDisplayNameView.swift
+++ b/Tusker/Views/AccountDisplayNameView.swift
@@ -33,6 +33,7 @@ struct AccountDisplayNameView: View {
             .onAppear(perform: self.loadEmojis)
     }
     
+    @MainActor
     private func loadEmojis() {
         let fullRange = NSRange(account.displayName.startIndex..., in: account.displayName)
         let matches = emojiRegex.matches(in: account.displayName, options: [], range: fullRange)
diff --git a/Tusker/Views/CustomEmojiImageView.swift b/Tusker/Views/CustomEmojiImageView.swift
index f046b9b83e..9155696dcf 100644
--- a/Tusker/Views/CustomEmojiImageView.swift
+++ b/Tusker/Views/CustomEmojiImageView.swift
@@ -33,6 +33,7 @@ struct CustomEmojiImageView: View {
         }
     }
     
+    @MainActor
     private func loadImage() {
         request = ImageCache.emojis.get(URL(emoji.url)!) { (_, image) in
             DispatchQueue.main.async {