diff --git a/emu-configs/mame/mame.ini b/emu-configs/mame/mame.ini
index 53d8e418..99812b94 100644
--- a/emu-configs/mame/mame.ini
+++ b/emu-configs/mame/mame.ini
@@ -27,7 +27,7 @@ swpath                    /app/share/mame/software
 cfg_directory             /var/config/mame/cfg
 nvram_directory           /var/config/mame/nvram
 input_directory           /var/config/mame/inp
-state_directory           RETRODECKSAVESDIR/mame-sa
+state_directory           RETRODECKSAVESDIR/mame-sa/states
 snapshot_directory        RETRODECKHOMEDIR/screenshots
 diff_directory            /var/config/mame/diff
 comment_directory         /var/config/mame/comments
diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh
index 0701df4d..d3952f80 100644
--- a/functions/prepare_emulator.sh
+++ b/functions/prepare_emulator.sh
@@ -710,6 +710,7 @@ prepare_emulator() {
 
     mkdir -p $saves_folder/mame-sa
     mkdir -p "/var/config/mame"
+    dir_prep "$saves_folder/mame-sa/hiscore" "/var/config/mame/hiscore"
     cp -fvr "$emuconfigs/mame/**" "/var/config/mame"
     sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/gzdoom/*.ini"
     sed -i 's#RETRODECKHOMESDIR#'$rdhome'#g' "/var/config/gzdoom/*.ini"
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index f0bcf236..52921ea2 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1225,7 +1225,7 @@ modules:
 
   - name: vita3k
     buildsystem: simple
-    build-commands:    
+    build-commands:
       # Copying the user icon
       - mkdir -p ${FLATPAK_DEST}/retrodeck
       - cp retrodeck.png ${FLATPAK_DEST}/retrodeck