diff --git a/external/cursive b/external/cursive
index 250d35f3..7df15342 160000
--- a/external/cursive
+++ b/external/cursive
@@ -1 +1 @@
-Subproject commit 250d35f37f526221539c8d59d7a2056803bf0010
+Subproject commit 7df15342b1f08b6b7a5cdc7aa8f97342d2e4ad7b
diff --git a/veilid-flutter/example/windows/runner/Runner.rc b/veilid-flutter/example/windows/runner/Runner.rc
index 3d3685cf..cbb7f232 100644
--- a/veilid-flutter/example/windows/runner/Runner.rc
+++ b/veilid-flutter/example/windows/runner/Runner.rc
@@ -60,14 +60,14 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 // Version
 //
 
-#ifdef FLUTTER_BUILD_NUMBER
-#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
 #else
-#define VERSION_AS_NUMBER 1,0,0
+#define VERSION_AS_NUMBER 1,0,0,0
 #endif
 
-#ifdef FLUTTER_BUILD_NAME
-#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
 #else
 #define VERSION_AS_STRING "1.0.0"
 #endif
diff --git a/veilid-flutter/lib/default_config.dart b/veilid-flutter/lib/default_config.dart
index 30f08c68..1337a68f 100644
--- a/veilid-flutter/lib/default_config.dart
+++ b/veilid-flutter/lib/default_config.dart
@@ -66,8 +66,8 @@ Future<VeilidConfig> getDefaultVeilidConfig(String programName) async {
       alwaysUseInsecureStorage: false,
       directory: "",
       delete: false,
-      deviceEncryptionKey: "",
-      newDeviceEncryptionKey: null,
+      deviceEncryptionKeyPassword: "",
+      newDeviceEncryptionKeyPassword: null,
     ),
     tableStore: VeilidConfigTableStore(
       directory: kIsWeb
diff --git a/veilid-flutter/lib/veilid_config.dart b/veilid-flutter/lib/veilid_config.dart
index 7a2134a8..8633d3e2 100644
--- a/veilid-flutter/lib/veilid_config.dart
+++ b/veilid-flutter/lib/veilid_config.dart
@@ -828,16 +828,16 @@ class VeilidConfigProtectedStore {
   bool alwaysUseInsecureStorage;
   String directory;
   bool delete;
-  String deviceEncryptionKey;
-  String? newDeviceEncryptionKey;
+  String deviceEncryptionKeyPassword;
+  String? newDeviceEncryptionKeyPassword;
 
   VeilidConfigProtectedStore(
       {required this.allowInsecureFallback,
       required this.alwaysUseInsecureStorage,
       required this.directory,
       required this.delete,
-      required this.deviceEncryptionKey,
-      String? newDeviceEncryptionKey});
+      required this.deviceEncryptionKeyPassword,
+      String? newDeviceEncryptionKeyPassword});
 
   Map<String, dynamic> toJson() {
     return {
@@ -845,8 +845,8 @@ class VeilidConfigProtectedStore {
       'always_use_insecure_storage': alwaysUseInsecureStorage,
       'directory': directory,
       'delete': delete,
-      'device_encryption_key': deviceEncryptionKey,
-      'new_device_encryption_key': newDeviceEncryptionKey,
+      'device_encryption_key_password': deviceEncryptionKeyPassword,
+      'new_device_encryption_key': newDeviceEncryptionKeyPassword,
     };
   }
 
@@ -855,8 +855,8 @@ class VeilidConfigProtectedStore {
         alwaysUseInsecureStorage = json['always_use_insecure_storage'],
         directory = json['directory'],
         delete = json['delete'],
-        deviceEncryptionKey = json['device_encryption_key'],
-        newDeviceEncryptionKey = json['new_device_encryption_key'];
+        deviceEncryptionKeyPassword = json['device_encryption_key_password'],
+        newDeviceEncryptionKeyPassword = json['new_device_encryption_key_password'];
 }
 
 ////////////