diff --git a/OBAKit/Controls/ListView/OBAListView.swift b/OBAKit/Controls/ListView/OBAListView.swift
index aa62d7741..49ff3403d 100644
--- a/OBAKit/Controls/ListView/OBAListView.swift
+++ b/OBAKit/Controls/ListView/OBAListView.swift
@@ -85,7 +85,7 @@ public class OBAListView: UICollectionView, UICollectionViewDelegate {
     // MARK: - Data source
 
     fileprivate func createDataSource() -> UICollectionViewDiffableDataSource<SectionType, ItemType> {
-        let dataSource = UICollectionViewDiffableDataSource<SectionType, ItemType>(collectionView: self) { (collectionView, indexPath, item) -> UICollectionViewCell? in
+        let dataSource = UICollectionViewDiffableDataSource<SectionType, ItemType>(collectionView: self) { [unowned self] (collectionView, indexPath, item) -> UICollectionViewCell? in
 
             switch item.configuration {
             case .custom(let config):
@@ -231,8 +231,13 @@ public class OBAListView: UICollectionView, UICollectionViewDelegate {
                 return configuration
             }
 
-            configuration.leadingSwipeActionsConfigurationProvider = self.leadingSwipeActions
-            configuration.trailingSwipeActionsConfigurationProvider = self.trailingSwipeActions
+            configuration.leadingSwipeActionsConfigurationProvider = { [unowned self] indexPath -> UISwipeActionsConfiguration? in
+                leadingSwipeActions(for: indexPath)
+            }
+
+            configuration.trailingSwipeActionsConfigurationProvider = { [unowned self] indexPath -> UISwipeActionsConfiguration? in
+                trailingSwipeActions(for: indexPath)
+            }
 
             return NSCollectionLayoutSection.list(using: configuration, layoutEnvironment: environment)
         }
diff --git a/OBAKit/Stops/StopViewController.swift b/OBAKit/Stops/StopViewController.swift
index 339c5fd70..a5e1d4898 100644
--- a/OBAKit/Stops/StopViewController.swift
+++ b/OBAKit/Stops/StopViewController.swift
@@ -446,7 +446,7 @@ public class StopViewController: UIViewController,
         title = Strings.updating
 
         let op = apiService.getArrivalsAndDeparturesForStop(id: stopID, minutesBefore: minutesBefore, minutesAfter: minutesAfter)
-        op.complete { [weak self] result in
+        op.complete { [weak self, unowned op] result in
             guard let self = self else { return }
 
             let broken = self.bookmarkContext != nil && (op.statusCodeIsEffectively404 ?? false)