diff --git a/Cartfile.resolved b/Cartfile.resolved
index 8653667..0284044 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1 +1 @@
-github "LoopKit/LoopKit" "fff218d34b0d6818a70541c6df5b584968897e53"
+github "LoopKit/LoopKit" "7333408f054e269669c91146b0f29bffbdcc150a"
diff --git a/ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClient.xcscheme b/ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClient.xcscheme
index 13e3884..58e16e6 100644
--- a/ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClient.xcscheme
+++ b/ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClient.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClientUI.xcscheme b/ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClientUI.xcscheme
index 4892c98..f5193fc 100644
--- a/ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClientUI.xcscheme
+++ b/ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClientUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ShareClient/ShareClientManager.swift b/ShareClient/ShareClientManager.swift
index d62b30f..8d9d6f9 100644
--- a/ShareClient/ShareClientManager.swift
+++ b/ShareClient/ShareClientManager.swift
@@ -36,7 +36,25 @@ public class ShareClientManager: CGMManager {
 
     public let appURL: URL? = nil
 
-    weak public var cgmManagerDelegate: CGMManagerDelegate?
+    public var cgmManagerDelegate: CGMManagerDelegate? {
+        get {
+            return delegate.delegate
+        }
+        set {
+            delegate.delegate = newValue
+        }
+    }
+
+    public var delegateQueue: DispatchQueue! {
+        get {
+            return delegate.queue
+        }
+        set {
+            delegate.queue = newValue
+        }
+    }
+
+    public let delegate = WeakSynchronizedDelegate<CGMManagerDelegate>()
 
     public let providesBLEHeartbeat = false
 
@@ -73,7 +91,9 @@ public class ShareClientManager: CGMManager {
             }
 
             // Ignore glucose values that are up to a minute newer than our previous value, to account for possible time shifting in Share data
-            let startDate = self.cgmManagerDelegate?.startDateToFilterNewData(for: self)?.addingTimeInterval(TimeInterval(minutes: 1))
+            let startDate = self.delegate.call { (delegate) -> Date? in
+                return delegate?.startDateToFilterNewData(for: self)?.addingTimeInterval(TimeInterval(minutes: 1))
+            }
             let newGlucose = glucose.filterDateRange(startDate, nil)
             let newSamples = newGlucose.filter({ $0.isStateValid }).map {
                 return NewGlucoseSample(date: $0.startDate, quantity: $0.quantity, isDisplayOnly: false, syncIdentifier: "\(Int($0.startDate.timeIntervalSince1970))", device: self.device)
diff --git a/ShareClientUI/ShareClientSettingsViewController.swift b/ShareClientUI/ShareClientSettingsViewController.swift
index b137785..cbcf60b 100644
--- a/ShareClientUI/ShareClientSettingsViewController.swift
+++ b/ShareClientUI/ShareClientSettingsViewController.swift
@@ -180,8 +180,11 @@ public class ShareClientSettingsViewController: UITableViewController {
             tableView.deselectRow(at: indexPath, animated: true)
         case .delete:
             let confirmVC = UIAlertController(cgmDeletionHandler: {
-                self.cgmManager.cgmManagerDelegate?.cgmManagerWantsDeletion(self.cgmManager)
-                self.complete()
+                self.cgmManager.notifyDelegateOfDeletion {
+                    DispatchQueue.main.async {
+                        self.complete()
+                    }
+                }
             })
 
             present(confirmVC, animated: true) {