diff --git a/include/recomp_input.h b/include/recomp_input.h
index db9b160..8599628 100644
--- a/include/recomp_input.h
+++ b/include/recomp_input.h
@@ -120,7 +120,8 @@ namespace recomp {
         std::vector<InputField> apply_menu;
     };
 
-    constexpr const std::vector<InputField>& get_default_mapping_for_input(const DefaultN64Mappings& defaults, const GameInput input) {
+    inline const std::vector<InputField>& get_default_mapping_for_input(const DefaultN64Mappings& defaults, const GameInput input) {
+        static const std::vector<InputField> empty_input_field{};
         switch (input) {
             case GameInput::A: return defaults.a;
             case GameInput::B: return defaults.b;
@@ -143,7 +144,7 @@ namespace recomp {
             case GameInput::TOGGLE_MENU: return defaults.toggle_menu;
             case GameInput::ACCEPT_MENU: return defaults.accept_menu;
             case GameInput::APPLY_MENU: return defaults.apply_menu;
-            default: return std::vector<InputField>();
+            default: return empty_input_field;
         }
     }
 
diff --git a/lib/N64ModernRuntime b/lib/N64ModernRuntime
index b9592c6..a7e5a77 160000
--- a/lib/N64ModernRuntime
+++ b/lib/N64ModernRuntime
@@ -1 +1 @@
-Subproject commit b9592c625d87ab45ddd12d9ad30c886ee77a5d68
+Subproject commit a7e5a7770f2344aa504725af6465e2db4565292c
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 910f545..6007ffa 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -650,6 +650,8 @@ int main(int argc, char** argv) {
             }
             printf("\n");
         }
+        // TODO load all mods as a temporary solution to not having a UI yet.
+        recomp::mods::enable_mod(mod.mod_id, true);
     }
     printf("\n");
 
diff --git a/src/main/register_patches.cpp b/src/main/register_patches.cpp
index 8725f81..ef800fd 100644
--- a/src/main/register_patches.cpp
+++ b/src/main/register_patches.cpp
@@ -8,5 +8,5 @@
 void zelda64::register_patches() {
     recomp::overlays::register_patches(mm_patches_bin, sizeof(mm_patches_bin), section_table, ARRLEN(section_table));
     recomp::overlays::register_base_exports(export_table);
-    recomp::overlays::register_base_events(event_name_table);
+    recomp::overlays::register_base_events(event_names);
 }