diff --git a/lib/src/dom/async/types.dart b/lib/src/dom/async/types.dart
index a9252a24..1540cf2b 100644
--- a/lib/src/dom/async/types.dart
+++ b/lib/src/dom/async/types.dart
@@ -23,6 +23,7 @@ import 'package:meta/meta.dart';
 /// Returns either an `Error` or a `TestFailure` when provided with the [originalError].
 typedef QueryTimeoutFn = /*Error || TestFailure*/ Object Function(/*Error*/ Object originalError);
 
+// todo should all these be optional / nullable?
 @JS()
 @anonymous
 class SharedJsWaitForOptions {
diff --git a/lib/src/dom/config/types.dart b/lib/src/dom/config/types.dart
index 6c93b187..2a8f20a8 100644
--- a/lib/src/dom/config/types.dart
+++ b/lib/src/dom/config/types.dart
@@ -40,6 +40,6 @@ class JsConfig {
   external bool get throwSuggestions;
   external set throwSuggestions(bool value);
 
-  external /*JsError*/ dynamic Function(String message, Element container) get getElementError;
-  external set getElementError(/*JsError*/ dynamic Function(String message, Element container) value);
+  external /*JsError*/ dynamic Function(String? message, Element container) get getElementError;
+  external set getElementError(/*JsError*/ dynamic Function(String? message, Element container) value);
 }
diff --git a/lib/src/dom/fire_event.dart b/lib/src/dom/fire_event.dart
index 5045773c..98db1d4c 100644
--- a/lib/src/dom/fire_event.dart
+++ b/lib/src/dom/fire_event.dart
@@ -124,19 +124,16 @@ external JsMap get _fireEventObj;
 ///
 /// {@category UserActions}
 bool fireEventByName(String eventName, Element element, [Map? eventProperties]) {
-  if (!JsBackedMap.fromJs(_jsEventMap).keys.contains(eventName)) {
+  if (!JsBackedMap.fromJs(_fireEventObj).keys.contains(eventName)) {
     throw ArgumentError.value(eventName, 'eventName');
   }
 
   final jsFireEventByNameFn =
-      JsBackedMap.fromJs(_fireEventObj)[eventName] as bool Function(Element, [/*JsObject*/ dynamic])?;
+      JsBackedMap.fromJs(_fireEventObj)[eventName] as bool Function(Element, [/*JsObject*/ dynamic]);
 
   if (eventProperties == null) {
-    return eventHandlerErrorCatcher(() => jsFireEventByNameFn!(element));
+    return eventHandlerErrorCatcher(() => jsFireEventByNameFn(element));
   }
 
-  return eventHandlerErrorCatcher(() => jsFireEventByNameFn!(element, jsifyAndAllowInterop(eventProperties)));
+  return eventHandlerErrorCatcher(() => jsFireEventByNameFn(element, jsifyAndAllowInterop(eventProperties)));
 }
-
-@JS('rtl.eventMap')
-external JsMap get _jsEventMap;