diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c8d9561..e9a8835 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -2,10 +2,10 @@
     package="com.e7na.blue">
 
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30" />
     <uses-permission
         android:name="android.permission.NEARBY_WIFI_DEVICES"
         android:usesPermissionFlags="neverForLocation"/>
diff --git a/lib/Bloc/ble_bloc.dart b/lib/Bloc/ble_bloc.dart
index 2cd778a..3987324 100644
--- a/lib/Bloc/ble_bloc.dart
+++ b/lib/Bloc/ble_bloc.dart
@@ -89,7 +89,9 @@ class BleBloc extends Bloc<BleEvent, BleState> {
       // if only one device is the final devices list then scan for that device only
       // else scan for all
       scanStream = ble
-          .scanForDevices(withServices: finalDevices.length == 1 ? finalDevices.first.uuids! : [])
+          .scanForDevices(
+              withServices: finalDevices.length == 1 ? finalDevices.first.uuids! : [],
+              scanMode: ScanMode.lowLatency)
           .listen((device) {
         final knownDeviceIndex = devices.indexWhere((d) => d.id == device.id);
         if (knownDeviceIndex >= 0) {
@@ -241,7 +243,6 @@ class BleBloc extends Bloc<BleEvent, BleState> {
     box.put("Keys", keys);
     box.put("Vectors", vectors);
     box.put("Uuids", uuids);
-    stopScan();
   }
 
   // Extract selected devices from the Hive Box into a list
diff --git a/lib/Screens/settings_page.dart b/lib/Screens/settings_page.dart
index 25398b6..eda2b67 100644
--- a/lib/Screens/settings_page.dart
+++ b/lib/Screens/settings_page.dart
@@ -80,13 +80,13 @@ Widget theScaffold({
                         padding: const EdgeInsets.symmetric(horizontal: 60.0),
                         child: ElevatedButton(
                             onPressed: () => {
-                                  B.stopScan(),
-                                  B.chosenDevices = [],
-                                  B.finalDevices = [],
+                                  B.chosenDevices.clear(),
+                                  B.finalDevices.clear(),
                                   B.box.put('NumDevices', 0),
                                   B.box.put("IDs", ""),
                                   B.box.put("Names", ""),
                                   B.box.put("Uuids", ""),
+                                  B.stopScan(),
                                   Navigator.of(context).pop(),
                                   Navigator.of(context).pushReplacement(
                                       MaterialPageRoute(builder: (context) => const ScanPage()))