diff --git a/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift b/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
index 1670c6a6..599e49ef 100644
--- a/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
+++ b/Tusker/Screens/Utilities/DiffableTimelineLikeTableViewController.swift
@@ -34,7 +34,9 @@ class DiffableTimelineLikeTableViewController<Section: Hashable & CaseIterable,
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        dataSource = UITableViewDiffableDataSource(tableView: tableView, cellProvider: self.cellProvider)
+        dataSource = UITableViewDiffableDataSource(tableView: tableView) { [unowned self] (tableView, indexPath, item) in
+            self.cellProvider(tableView, indexPath, item)
+        }
         
         tableView.rowHeight = UITableView.automaticDimension
         tableView.estimatedRowHeight = 140
diff --git a/Tusker/Views/Profile Header/ProfileHeaderView.swift b/Tusker/Views/Profile Header/ProfileHeaderView.swift
index 3742e6f3..f717b83a 100644
--- a/Tusker/Views/Profile Header/ProfileHeaderView.swift	
+++ b/Tusker/Views/Profile Header/ProfileHeaderView.swift	
@@ -171,7 +171,6 @@ class ProfileHeaderView: UIView {
     }
     
     private func updateRelationship() {
-        // todo: mastodonController should never be nil, but ProfileHeaderViews are getting leaked
         guard let mastodonController = mastodonController,
               let relationship = mastodonController.persistentContainer.relationship(forAccount: accountID) else {
                   return
@@ -181,7 +180,6 @@ class ProfileHeaderView: UIView {
     }
     
     @objc private func updateUIForPreferences() {
-        // todo: mastodonController should never be nil, but ProfileHeaderViews are getting leaked
         guard let mastodonController = mastodonController,
               // nil if prefs changed before own account is loaded
               let accountID = accountID,