diff --git a/WatchApp Extension/Controllers/BolusInterfaceController.swift b/WatchApp Extension/Controllers/BolusInterfaceController.swift
index 67a5672f69..34931d463d 100644
--- a/WatchApp Extension/Controllers/BolusInterfaceController.swift	
+++ b/WatchApp Extension/Controllers/BolusInterfaceController.swift	
@@ -84,10 +84,8 @@ final class BolusInterfaceController: WKInterfaceController, IdentifiableClass {
         var maxBolusValue: Double = 15
         var pickerValue = 0
 
-        let info: BolusSuggestionUserInfo? = BolusSuggestionUserInfo(recommendedBolus: 3.5, maxBolus: 10)
-
-        if let context = info {
-            let recommendedBolus = 3.5
+        if let context = context as? BolusSuggestionUserInfo {
+            let recommendedBolus = context.recommendedBolus
 
             if let maxBolus = context.maxBolus {
                 maxBolusValue = maxBolus
@@ -96,7 +94,6 @@ final class BolusInterfaceController: WKInterfaceController, IdentifiableClass {
             }
 
             let recommendedPickerValue = pickerValueFromBolusValue(recommendedBolus)
-            maxBolusValue = bolusValueFromPickerValue(maxPickerValue)
             pickerValue = Int(Double(recommendedPickerValue) * 0.75)
 
             if let valueString = formatter.string(from: NSNumber(value: recommendedBolus)) {
diff --git a/WatchApp Extension/ExtensionDelegate.swift b/WatchApp Extension/ExtensionDelegate.swift
index b4f946b104..0e00462b73 100644
--- a/WatchApp Extension/ExtensionDelegate.swift	
+++ b/WatchApp Extension/ExtensionDelegate.swift	
@@ -132,7 +132,9 @@ final class ExtensionDelegate: NSObject, WKExtensionDelegate {
                     server.reloadTimeline(for: complication)
                 } else {
                     os_log("Extending complication timeline")
-                    server.extendTimeline(for: complication)
+                    // TODO: Switch this back to extendTimeline if things are working correctly.
+                    // Time Travel appears to be disabled by default in watchOS 3 anyway
+                    server.reloadTimeline(for: complication)
                 }
             }
         }