diff --git a/OmniKit.xcodeproj/project.pbxproj b/OmniKit.xcodeproj/project.pbxproj
index 3bc7eaa..10821f2 100644
--- a/OmniKit.xcodeproj/project.pbxproj
+++ b/OmniKit.xcodeproj/project.pbxproj
@@ -1567,7 +1567,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = "$(CLANG_MODULES_ENABLE_VERIFIER_TOOL)";
+				ENABLE_MODULE_VERIFIER = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1603,7 +1603,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = "$(CLANG_MODULES_ENABLE_VERIFIER_TOOL)";
+				ENABLE_MODULE_VERIFIER = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1639,7 +1639,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = "$(CLANG_MODULES_ENABLE_VERIFIER_TOOL)";
+				ENABLE_MODULE_VERIFIER = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1676,7 +1676,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = "$(CLANG_MODULES_ENABLE_VERIFIER_TOOL)";
+				ENABLE_MODULE_VERIFIER = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1713,7 +1713,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = "$(CLANG_MODULES_ENABLE_VERIFIER_TOOL)";
+				ENABLE_MODULE_VERIFIER = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = OmniKitPlugin/Info.plist;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -1752,7 +1752,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = "$(CLANG_MODULES_ENABLE_VERIFIER_TOOL)";
+				ENABLE_MODULE_VERIFIER = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = OmniKitPlugin/Info.plist;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
diff --git a/OmniKit/PumpManager/OmnipodPumpManager.swift b/OmniKit/PumpManager/OmnipodPumpManager.swift
index aba8b5e..87c055d 100644
--- a/OmniKit/PumpManager/OmnipodPumpManager.swift
+++ b/OmniKit/PumpManager/OmnipodPumpManager.swift
@@ -92,7 +92,7 @@ extension OmnipodPumpManagerError: LocalizedError {
 
 public class OmnipodPumpManager: RileyLinkPumpManager {
     
-    public static let pluginIdentifier: String = "Omnipod"
+    public let pluginIdentifier: String = "Omnipod"
     
     public let localizedTitle = LocalizedString("Omnipod", comment: "Generic title of the omnipod pump manager")
     
@@ -490,7 +490,7 @@ extension OmnipodPumpManager {
 
         switch podCommState(for: state) {
         case .fault:
-            return .active(.distantPast)
+            return .pumpInoperable
         default:
             break
         }
diff --git a/OmniKitUI/ViewModels/OmnipodSettingsViewModel.swift b/OmniKitUI/ViewModels/OmnipodSettingsViewModel.swift
index 3dae32c..b0bd65b 100644
--- a/OmniKitUI/ViewModels/OmnipodSettingsViewModel.swift
+++ b/OmniKitUI/ViewModels/OmnipodSettingsViewModel.swift
@@ -161,7 +161,7 @@ class OmnipodSettingsViewModel: ObservableObject {
         switch basalDeliveryState {
         case .active(_), .initiatingTempBasal:
             return true
-        case .tempBasal(_), .cancelingTempBasal, .suspending, .suspended(_), .resuming, .none:
+        default:
             return false
         }
     }
diff --git a/OmniKitUI/Views/ExpirationReminderPickerView.swift b/OmniKitUI/Views/ExpirationReminderPickerView.swift
index e7a5e5b..6744535 100644
--- a/OmniKitUI/Views/ExpirationReminderPickerView.swift
+++ b/OmniKitUI/Views/ExpirationReminderPickerView.swift
@@ -43,9 +43,14 @@ struct ExpirationReminderPickerView: View {
                 }
             }
             if showingHourPicker {
-                ResizeablePicker(selection: expirationReminderDefault,
-                                 data: Array(Self.expirationReminderHoursAllowed),
-                                 formatter: { expirationReminderHourString($0) })
+                Picker(selection: expirationReminderDefault) {
+                    ForEach(Array(Self.expirationReminderHoursAllowed), id: \.self) { value in
+                        Text(expirationReminderHourString(value))
+                    }
+                } label: {
+                    EmptyView()
+                }
+                .pickerStyle(.wheel)
             }
         }
     }
diff --git a/OmniKitUI/Views/ManualTempBasalEntryView.swift b/OmniKitUI/Views/ManualTempBasalEntryView.swift
index 0a77234..b20b841 100644
--- a/OmniKitUI/Views/ManualTempBasalEntryView.swift
+++ b/OmniKitUI/Views/ManualTempBasalEntryView.swift
@@ -81,12 +81,23 @@ struct ManualTempBasalEntryView: View {
                         Text(String(format: LocalizedString("%1$@ for %2$@", comment: "Summary string for temporary basal rate configuration page"), formatRate(rateEntered), formatDuration(durationEntered)))
                     }
                     HStack {
-                        ResizeablePicker(selection: $rateEntered,
-                                         data: allowedRates,
-                                         formatter: { formatRate($0) })
-                        ResizeablePicker(selection: $durationEntered,
-                                         data: Pod.supportedTempBasalDurations,
-                                         formatter: { formatDuration($0) })
+                        Picker(selection: $rateEntered) {
+                            ForEach(allowedRates, id: \.self) { value in
+                                Text(formatRate(value))
+                            }
+                        } label: {
+                            EmptyView()
+                        }
+                        .pickerStyle(.wheel)
+                        
+                        Picker(selection: $durationEntered) {
+                            ForEach(Pod.supportedTempBasalDurations, id: \.self) { value in
+                                Text(formatDuration(value))
+                            }
+                        } label: {
+                            EmptyView()
+                        }
+                        .pickerStyle(.wheel)
                     }
                     .frame(maxHeight: 162.0)
                     .alert(isPresented: $showingMissingConfigAlert, content: { missingConfigAlert })