diff --git a/lib/chat/cubits/single_contact_messages_cubit.dart b/lib/chat/cubits/single_contact_messages_cubit.dart
index 6605ab6..de281fe 100644
--- a/lib/chat/cubits/single_contact_messages_cubit.dart
+++ b/lib/chat/cubits/single_contact_messages_cubit.dart
@@ -391,7 +391,7 @@ class SingleContactMessagesCubit extends Cubit<SingleContactMessagesState> {
     _renderState();
   }
 
-  final WaitSet _initWait = WaitSet();
+  final WaitSet<void> _initWait = WaitSet();
   final ActiveAccountInfo _activeAccountInfo;
   final TypedKey _remoteIdentityPublicKey;
   final TypedKey _localConversationRecordKey;
diff --git a/lib/contacts/cubits/conversation_cubit.dart b/lib/contacts/cubits/conversation_cubit.dart
index 6edb533..253dbba 100644
--- a/lib/contacts/cubits/conversation_cubit.dart
+++ b/lib/contacts/cubits/conversation_cubit.dart
@@ -159,7 +159,7 @@ class ConversationCubit extends Cubit<AsyncValue<ConversationState>> {
     final localConversationCubit = _localConversationCubit;
     final remoteConversationCubit = _remoteConversationCubit;
 
-    final deleteSet = DelayedWaitSet();
+    final deleteSet = DelayedWaitSet<void>();
 
     if (localConversationCubit != null) {
       final data = localConversationCubit.state.asData;
@@ -351,5 +351,5 @@ class ConversationCubit extends Cubit<AsyncValue<ConversationState>> {
       localConversation: null, remoteConversation: null);
   //
   DHTRecordCrypto? _conversationCrypto;
-  final WaitSet _initWait = WaitSet();
+  final WaitSet<void> _initWait = WaitSet();
 }
diff --git a/packages/veilid_support/lib/dht_support/src/dht_record/dht_record_cubit.dart b/packages/veilid_support/lib/dht_support/src/dht_record/dht_record_cubit.dart
index 5cfa721..15919f9 100644
--- a/packages/veilid_support/lib/dht_support/src/dht_record/dht_record_cubit.dart
+++ b/packages/veilid_support/lib/dht_support/src/dht_record/dht_record_cubit.dart
@@ -112,7 +112,7 @@ class DHTRecordCubit<T> extends Cubit<AsyncValue<T>> {
   DHTRecord get record => _record;
 
   @protected
-  final WaitSet initWait = WaitSet();
+  final WaitSet<void> initWait = WaitSet();
 
   StreamSubscription<DHTRecordWatchChange>? _subscription;
   late DHTRecord _record;
diff --git a/packages/veilid_support/lib/dht_support/src/dht_short_array/dht_short_array_cubit.dart b/packages/veilid_support/lib/dht_support/src/dht_short_array/dht_short_array_cubit.dart
index 3375e9f..7465715 100644
--- a/packages/veilid_support/lib/dht_support/src/dht_short_array/dht_short_array_cubit.dart
+++ b/packages/veilid_support/lib/dht_support/src/dht_short_array/dht_short_array_cubit.dart
@@ -121,7 +121,7 @@ class DHTShortArrayCubit<T> extends Cubit<DHTShortArrayBusyState<T>>
     return _shortArray.operateWriteEventual(closure, timeout: timeout);
   }
 
-  final WaitSet _initWait = WaitSet();
+  final WaitSet<void> _initWait = WaitSet();
   late final DHTShortArray _shortArray;
   final T Function(List<int> data) _decodeElement;
   StreamSubscription<void>? _subscription;
diff --git a/packages/veilid_support/lib/src/async_table_db_backed_cubit.dart b/packages/veilid_support/lib/src/async_table_db_backed_cubit.dart
index 5d0d84f..710eec4 100644
--- a/packages/veilid_support/lib/src/async_table_db_backed_cubit.dart
+++ b/packages/veilid_support/lib/src/async_table_db_backed_cubit.dart
@@ -42,6 +42,6 @@ abstract class AsyncTableDBBackedCubit<T> extends Cubit<AsyncValue<T?>>
     }
   }
 
-  final WaitSet _initWait = WaitSet();
+  final WaitSet<void> _initWait = WaitSet();
   final Mutex _mutex = Mutex();
 }
diff --git a/packages/veilid_support/lib/src/persistent_queue.dart b/packages/veilid_support/lib/src/persistent_queue.dart
index 63f0cfb..f0cf17a 100644
--- a/packages/veilid_support/lib/src/persistent_queue.dart
+++ b/packages/veilid_support/lib/src/persistent_queue.dart
@@ -185,7 +185,7 @@ class PersistentQueue<T extends GeneratedMessage>
   final String _key;
   final T Function(Uint8List) _fromBuffer;
   final bool _deleteOnClose;
-  final WaitSet _initWait = WaitSet();
+  final WaitSet<void> _initWait = WaitSet();
   final Mutex _queueMutex = Mutex();
   IList<T> _queue = IList<T>.empty();
   final StreamController<Iterable<T>> _syncAddController = StreamController();
diff --git a/packages/veilid_support/lib/src/table_db.dart b/packages/veilid_support/lib/src/table_db.dart
index d0fb72e..773309b 100644
--- a/packages/veilid_support/lib/src/table_db.dart
+++ b/packages/veilid_support/lib/src/table_db.dart
@@ -172,7 +172,7 @@ class TableDBValue<T> extends TableDBBackedJson<T> {
   final T? Function(Object? obj) _valueFromJson;
   final Object? Function(T? obj) _valueToJson;
   final StreamController<T> _streamController;
-  final WaitSet _initWait = WaitSet();
+  final WaitSet<void> _initWait = WaitSet();
 
   //////////////////////////////////////////////////////////////
   /// AsyncTableDBBacked
diff --git a/packages/veilid_support/pubspec.lock b/packages/veilid_support/pubspec.lock
index 5cfd348..08ab7e2 100644
--- a/packages/veilid_support/pubspec.lock
+++ b/packages/veilid_support/pubspec.lock
@@ -36,10 +36,9 @@ packages:
   async_tools:
     dependency: "direct main"
     description:
-      name: async_tools
-      sha256: "972f68ab663724d86260a31e363c1355ff493308441b872bf4e7b8adc67c832c"
-      url: "https://pub.dev"
-    source: hosted
+      path: "../../../dart_async_tools"
+      relative: true
+    source: path
     version: "0.1.0"
   bloc:
     dependency: "direct main"
@@ -52,10 +51,9 @@ packages:
   bloc_advanced_tools:
     dependency: "direct main"
     description:
-      name: bloc_advanced_tools
-      sha256: bc0e1d5c26ae7df011464ab6abc2134dcfb668952acc87359abc7457cab091dd
-      url: "https://pub.dev"
-    source: hosted
+      path: "../../../bloc_advanced_tools"
+      relative: true
+    source: path
     version: "0.1.0"
   boolean_selector:
     dependency: transitive
@@ -718,7 +716,7 @@ packages:
       path: "../../../veilid/veilid-flutter"
       relative: true
     source: path
-    version: "0.3.1"
+    version: "0.3.2"
   vm_service:
     dependency: transitive
     description:
diff --git a/packages/veilid_support/pubspec.yaml b/packages/veilid_support/pubspec.yaml
index 99eb44e..b4232e7 100644
--- a/packages/veilid_support/pubspec.yaml
+++ b/packages/veilid_support/pubspec.yaml
@@ -23,6 +23,12 @@ dependencies:
     #   veilid: ^0.0.1
     path: ../../../veilid/veilid-flutter
 
+dependency_overrides:
+  async_tools: 
+    path: ../../../dart_async_tools
+  bloc_advanced_tools: 
+    path: ../../../bloc_advanced_tools
+
 dev_dependencies:
   build_runner: ^2.4.8
   freezed: ^2.4.7