diff --git a/src/js/core/config.js b/src/js/core/config.js
index 1d76ce6d..7b09443e 100644
--- a/src/js/core/config.js
+++ b/src/js/core/config.js
@@ -37,7 +37,7 @@ export const globalConfig = {
 
     // Belt speeds
     // NOTICE: Update webpack.production.config too!
-    beltSpeedItemsPerSecond: 10,
+    beltSpeedItemsPerSecond: 1,
     itemSpacingOnBelts: 0.63,
     minerSpeedItemsPerSecond: 0, // COMPUTED
 
@@ -71,7 +71,7 @@ export const globalConfig = {
 
     debug: {
         /* dev:start */
-        fastGameEnter: true,
+        // fastGameEnter: true,
         noArtificialDelays: true,
         // disableSavegameWrite: true,
         showEntityBounds: false,
diff --git a/src/js/game/hud/parts/pinned_shapes.js b/src/js/game/hud/parts/pinned_shapes.js
index 9475a757..a463c602 100644
--- a/src/js/game/hud/parts/pinned_shapes.js
+++ b/src/js/game/hud/parts/pinned_shapes.js
@@ -18,6 +18,7 @@ export class HUDPinnedShapes extends BaseHUDPart {
         this.rerenderFull();
 
         this.root.signals.storyGoalCompleted.add(this.rerenderFull, this);
+        this.root.signals.postLoadHook.add(this.rerenderFull, this);
         this.root.hud.signals.shapePinRequested.add(this.pinNewShape, this);
     }
 
diff --git a/src/js/savegame/savegame_manager.js b/src/js/savegame/savegame_manager.js
index 60f74989..b3c0d735 100644
--- a/src/js/savegame/savegame_manager.js
+++ b/src/js/savegame/savegame_manager.js
@@ -161,7 +161,7 @@ export class SavegameManager extends ReadWriteProxy {
     sortSavegames() {
         this.currentData.savegames.sort((a, b) => b.lastUpdate - a.lastUpdate);
         let promiseChain = Promise.resolve();
-        while (this.currentData.savegames.length > 100) {
+        while (this.currentData.savegames.length > 30) {
             const toRemove = this.currentData.savegames.pop();
 
             // Try to remove the savegame since its no longer available
@@ -200,7 +200,7 @@ export class SavegameManager extends ReadWriteProxy {
             if (G_IS_DEV && globalConfig.debug.disableSavegameWrite) {
                 return Promise.resolve();
             }
-            return this.writeAsync();
+            return this.sortSavegames().then(() => this.writeAsync());
         });
     }
 }