diff --git a/examples/tabs/tabs.rs b/examples/tabs/tabs.rs
index bf3b892d4ab5d5c0d2ea999ff2960317cc1e8bb9..9b199a98f14c7db8f9717291ed799312c45a3c71 100644
--- a/examples/tabs/tabs.rs
+++ b/examples/tabs/tabs.rs
@@ -96,7 +96,7 @@ fn startup(
 ) {
     commands.spawn_bundle(UICameraBundle::new());
 
-    font_mapping.add(asset_server.load("roboto.kayak_font"));
+    font_mapping.add("Roboto", asset_server.load("roboto.kayak_font"));
 
     let theme = TabTheme {
         primary: Default::default(),
diff --git a/kayak_core/src/event_dispatcher.rs b/kayak_core/src/event_dispatcher.rs
index 4d10a67e7ef4954223064c25b6b06ecf2363c135..5fd69cdba6a1ff411f5c9473acfced223d020c89 100644
--- a/kayak_core/src/event_dispatcher.rs
+++ b/kayak_core/src/event_dispatcher.rs
@@ -48,7 +48,6 @@ impl EventDispatcher {
         Self {
             last_clicked: Binding::new(Index::default()),
             is_mouse_pressed: Default::default(),
-            current_focus: Default::default(),
             current_mouse_position: Default::default(),
             next_mouse_position: Default::default(),
             previous_events: Default::default(),
@@ -151,7 +150,7 @@ impl EventDispatcher {
     fn build_event_stream(
         &mut self,
         input_events: &[InputEvent],
-        widget_manager: &WidgetManager,
+        widget_manager: &mut WidgetManager,
     ) -> Vec<Event> {
         let mut event_stream = Vec::<Event>::new();
         let mut states: HashMap<EventType, EventState> = HashMap::new();
@@ -328,7 +327,7 @@ impl EventDispatcher {
         &mut self,
         input_event: &InputEvent,
         _states: &mut HashMap<EventType, EventState>,
-        _widget_manager: &WidgetManager,
+        widget_manager: &WidgetManager,
     ) -> Vec<Event> {
         let mut event_stream = Vec::new();
         if let Some(current_focus) = widget_manager.focus_tree.current() {