diff --git a/src/main/geninput/input.c b/src/main/geninput/input.c
index b37292e..60c94c2 100644
--- a/src/main/geninput/input.c
+++ b/src/main/geninput/input.c
@@ -25,10 +25,20 @@ static volatile long input_init_count;
 static FILE *mapper_config_open(const char *game_type, const char *mode)
 {
     char path[MAX_PATH];
+    FILE *f;
 
-    str_format(path, sizeof(path), "%s_v5_00a07.bin", game_type);
+    str_format(path, sizeof(path), "%s.bin", game_type);
+    f = fopen_appdata("DJHACKERS", path, mode);
 
-    return fopen_appdata("DJHACKERS", path, mode);
+    // Try to load the old save file only if we're loading
+    if (f == NULL) {
+        if (strchr(mode, 'r') != NULL) {
+            str_format(path, sizeof(path), "%s_v5_00a07.bin", game_type);
+            f = fopen_appdata("DJHACKERS", path, mode);
+        }
+    }
+    
+    return f;
 }
 
 void input_set_loggers(
diff --git a/src/main/geninput/mapper-s11n.c b/src/main/geninput/mapper-s11n.c
index 2b7225d..3dba127 100644
--- a/src/main/geninput/mapper-s11n.c
+++ b/src/main/geninput/mapper-s11n.c
@@ -7,7 +7,7 @@
 #include "util/mem.h"
 
 enum mapper_config_version {
-    MAPPER_VERSION_BEFORE_VERSIONING,
+    MAPPER_VERSION_BEFORE_VERSIONING = 0,
     MAPPER_VERSION_INVERT_AXIS,
 
     // --- Add new versions above this line --- //
@@ -32,7 +32,7 @@ static void mapper_impl_config_save_lights(struct mapper *m, FILE *f);
 struct mapper *mapper_impl_config_load(FILE *f)
 {
     struct mapper *m;
-    uint32_t version = 0;
+    uint32_t version = MAPPER_VERSION_BEFORE_VERSIONING;
 
     hid_mgr_lock(); /* Need to convert from HID objects to /dev nodes */
 
@@ -55,7 +55,7 @@ struct mapper *mapper_impl_config_load(FILE *f)
 static uint32_t mapper_impl_config_load_version(FILE *f)
 {
     uint32_t fourcc = 0;
-    uint32_t version = 0;
+    uint32_t version = MAPPER_VERSION_BEFORE_VERSIONING;
 
     if (!read_u32(f, &fourcc)) {
         return 0;