diff --git a/archive-win32.sh b/archive-win32.sh
index 3c0eeec36..85ab5ae46 100644
--- a/archive-win32.sh
+++ b/archive-win32.sh
@@ -16,11 +16,13 @@ rm -rf "$MILKDROP"
 mkdir -p "$VANILLA/plugins"
 mkdir -p "$VANILLA/themes"
 mkdir -p "$VANILLA/locales"
+mkdir -p "$VANILLA/fonts"
 cp bin/release/musikcube.exe "$VANILLA" 
 cp bin/release/*.dll "$VANILLA" 
 cp bin/release/plugins/*.dll "$VANILLA/plugins"
 cp bin/release/themes/*.json "$VANILLA/themes"
 cp bin/release/locales/*.json "$VANILLA/locales"
+cp bin/release/fonts/*.ttf "$VANILLA/fonts"
 rm "$VANILLA/plugins/vis_milk2.dll"
 pushd $VANILLA
 7z a -tzip "musikcube_win32_$VERSION.zip" ./* -mx=9
@@ -30,11 +32,13 @@ popd
 mkdir -p "$MILKDROP/plugins"
 mkdir -p "$MILKDROP/themes"
 mkdir -p "$MILKDROP/locales"
+mkdir -p "$VANILLA/fonts"
 cp bin/release/musikcube.exe "$MILKDROP"
 cp bin/release/*.dll "$MILKDROP" 
 cp bin/release/plugins/*.dll "$MILKDROP/plugins"
 cp bin/release/themes/*.json "$MILKDROP/themes"
 cp bin/release/locales/*.json "$MILKDROP/locales"
+cp bin/release/fonts/*.ttf "$VANILLA/fonts"
 cp -rfp bin/release/plugins/Milkdrop2 "$MILKDROP/plugins"
 pushd $MILKDROP
 7z a -tzip "musikcube_win32_with_milkdrop2_$VERSION.zip" ./* -mx=9
diff --git a/src/core/support/Playback.cpp b/src/core/support/Playback.cpp
index bbdd8c010..552669c68 100644
--- a/src/core/support/Playback.cpp
+++ b/src/core/support/Playback.cpp
@@ -79,15 +79,17 @@ namespace musik {
             }
 
             void LoadPlaybackContext(Prefs prefs, ILibraryPtr library, PlaybackService& playback) {
-                auto query = std::shared_ptr<PersistedPlayQueueQuery>(
-                    PersistedPlayQueueQuery::Restore(library, playback));
+                if (prefs->GetBool(keys::SaveSessionOnExit, true)) {
+                    auto query = std::shared_ptr<PersistedPlayQueueQuery>(
+                        PersistedPlayQueueQuery::Restore(library, playback));
 
-                library->Enqueue(query, ILibrary::QuerySynchronous);
+                    library->Enqueue(query, ILibrary::QuerySynchronous);
 
-                int index = prefs->GetInt(keys::LastPlayQueueIndex, -1);
-                if (index >= 0) {
-                    double time = prefs->GetDouble(keys::LastPlayQueueTime, 0.0f);
-                    playback.Prepare(index, time);
+                    int index = prefs->GetInt(keys::LastPlayQueueIndex, -1);
+                    if (index >= 0) {
+                        double time = prefs->GetDouble(keys::LastPlayQueueTime, 0.0f);
+                        playback.Prepare(index, time);
+                    }
                 }
             }