diff --git a/Loop/Extensions/NSUserDefaults.swift b/Loop/Extensions/NSUserDefaults.swift
index 415bbea12b..98515b8fec 100644
--- a/Loop/Extensions/NSUserDefaults.swift
+++ b/Loop/Extensions/NSUserDefaults.swift
@@ -80,7 +80,7 @@ extension UserDefaults {
                     return .enlite
                 }
 
-                if let transmitterID = string(forKey: "com.loudnate.Naterade.TransmitterID"), transmitterID.characters.count == 6 {
+                if let transmitterID = string(forKey: "com.loudnate.Naterade.TransmitterID"), transmitterID.count == 6 {
                     self.cgm = .g5(transmitterID: transmitterID)
                     return .g5(transmitterID: transmitterID)
                 }
diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
index 0d3f1367eb..f0c2a34a50 100644
--- a/Loop/Managers/DeviceDataManager.swift
+++ b/Loop/Managers/DeviceDataManager.swift
@@ -521,7 +521,7 @@ final class DeviceDataManager {
 
             var pumpID = newValue
 
-            if let pumpID = pumpID, pumpID.characters.count == 6 {
+            if let pumpID = pumpID, pumpID.count == 6 {
                 let pumpState = PumpState(pumpID: pumpID, pumpRegion: self.pumpState?.pumpRegion ?? .northAmerica)
 
                 if let timeZone = self.pumpState?.timeZone {
diff --git a/WatchApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/WatchApp/Assets.xcassets/AppIcon.appiconset/Contents.json
index 7c1352bce2..a8d3101a64 100644
--- a/WatchApp/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/WatchApp/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -53,10 +53,16 @@
       "scale" : "2x",
       "role" : "quickLook",
       "subtype" : "42mm"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "watch-marketing",
+      "filename" : "Icon-App-Store-1024.png",
+      "scale" : "1x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
\ No newline at end of file
+}
diff --git a/WatchApp/Assets.xcassets/AppIcon.appiconset/Icon-App-Store-1024.png b/WatchApp/Assets.xcassets/AppIcon.appiconset/Icon-App-Store-1024.png
new file mode 100644
index 0000000000..189337f741
Binary files /dev/null and b/WatchApp/Assets.xcassets/AppIcon.appiconset/Icon-App-Store-1024.png differ