diff --git a/veilid-core/run_tests.sh b/veilid-core/run_tests.sh
index d3e0376a..0ee1c973 100755
--- a/veilid-core/run_tests.sh
+++ b/veilid-core/run_tests.sh
@@ -30,8 +30,8 @@ elif [[ "$1" == "ios" ]]; then
 elif [[ "$1" == "android" ]]; then
     ID="$2"
     if [[ "$ID" == "" ]]; then 
-        echo "No emulator ID specified"
-        exit 1
+        echo "No emulator ID specified, trying 'emulator-5554'"
+        ID="emulator-5554"
     fi
     APPNAME=veilid_core_android_tests
     APPID=com.veilid.veilid_core_android_tests
diff --git a/veilid-core/src/rpc_processor/coders/operations/operation_watch_value.rs b/veilid-core/src/rpc_processor/coders/operations/operation_watch_value.rs
index 77eea5a5..f7e0ea14 100644
--- a/veilid-core/src/rpc_processor/coders/operations/operation_watch_value.rs
+++ b/veilid-core/src/rpc_processor/coders/operations/operation_watch_value.rs
@@ -22,10 +22,9 @@ impl RPCOperationWatchValueQ {
         watcher: PublicKey,
         signature: Signature,
     ) -> Result<Self, RPCError> {
-        #[cfg(target_arch = "wasm32")]
+        // Needed because RangeSetBlaze uses different types here all the time
+        #[allow(clippy::unnecessary_cast)]
         let subkeys_len = subkeys.len() as usize;
-        #[cfg(not(target_arch = "wasm32"))]
-        let subkeys_len = subkeys.len();
 
         if subkeys_len > MAX_WATCH_VALUE_Q_SUBKEYS_LEN {
             return Err(RPCError::protocol("WatchValueQ subkeys length too long"));
@@ -42,10 +41,9 @@ impl RPCOperationWatchValueQ {
 
     // signature covers: key, subkeys, expiration, count, using watcher key
     fn make_signature_data(&self) -> Vec<u8> {
-        #[cfg(target_arch = "wasm32")]
+        // Needed because RangeSetBlaze uses different types here all the time
+        #[allow(clippy::unnecessary_cast)]
         let subkeys_len = self.subkeys.len() as usize;
-        #[cfg(not(target_arch = "wasm32"))]
-        let subkeys_len = self.subkeys.len();
 
         let mut sig_data = Vec::with_capacity(PUBLIC_KEY_LENGTH + 4 + (subkeys_len * 8) + 8 + 4);
         sig_data.extend_from_slice(&self.key.kind.0);
diff --git a/veilid-flutter/example/android/build.gradle b/veilid-flutter/example/android/build.gradle
index b05ad989..8764a914 100644
--- a/veilid-flutter/example/android/build.gradle
+++ b/veilid-flutter/example/android/build.gradle
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }