diff --git a/Meshtastic/Views/Onboarding/DeviceOnboarding.swift b/Meshtastic/Views/Onboarding/DeviceOnboarding.swift
index d82fe542..b4a29651 100644
--- a/Meshtastic/Views/Onboarding/DeviceOnboarding.swift
+++ b/Meshtastic/Views/Onboarding/DeviceOnboarding.swift
@@ -14,6 +14,7 @@ struct DeviceOnboarding: View {
 	}
 	
 	@EnvironmentObject var accessoryManager: AccessoryManager
+	@ObservedObject private var locationsHandler: LocationsHandler = .shared
 	@State var navigationPath: [SetupGuide] = []
 	@State var locationStatus = LocationsHandler.shared.manager.authorizationStatus
 	@AppStorage("provideLocation") private var provideLocation: Bool = false
@@ -239,10 +240,7 @@ struct DeviceOnboarding: View {
 						title: String(localized: "Battery Usage"),
 						subtitle: String(localized: "Enabling background activity may increase battery usage. You can toggle this at any time in the app settings.")
 					)
-					Toggle(isOn: Binding(
-						get: { LocationsHandler.shared.backgroundActivity },
-						set: { LocationsHandler.shared.backgroundActivity = $0 }
-					)) {
+					Toggle(isOn: $locationsHandler.backgroundActivity) {
 						Label {
 							Text("Enable Background Activity")
 						} icon: {
diff --git a/Meshtastic/Views/Settings/Firmware.swift b/Meshtastic/Views/Settings/Firmware.swift
index 79ca14e1..41c34897 100644
--- a/Meshtastic/Views/Settings/Firmware.swift
+++ b/Meshtastic/Views/Settings/Firmware.swift
@@ -62,7 +62,7 @@ struct Firmware: View {
 						.foregroundStyle(.red)
 						.font(.title2)
 						.padding(.bottom)
-					Text("Current Firmware Version: \(connectedVersion), Latest Firmware Version: \(accessoryManager.minimumVersion)")
+					Text("Current Firmware Version: \(connectedVersion), Minimum Required Version: \(accessoryManager.minimumVersion)")
 						.fixedSize(horizontal: false, vertical: true)
 						.font(.title3)
 						.padding(.bottom)