diff --git a/compile.hxml b/compile.hxml
index 532a696f..8433cd84 100644
--- a/compile.hxml
+++ b/compile.hxml
@@ -1,7 +1,6 @@
 -cp src
 -lib heaps
 -lib hlsdl
--lib zyheaps
 -hl marblegame.hl
 -D windowSize=1280x720
 -D keep-inline-positions
diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx
index 40f29b7d..61549677 100644
--- a/src/MarbleWorld.hx
+++ b/src/MarbleWorld.hx
@@ -1103,7 +1103,7 @@ class MarbleWorld extends Scheduler {
 		ProfilerUI.measure("updateTimer");
 		this.updateTimer(dt);
 
-		if (Key.isPressed(Settings.controlsSettings.respawn)) {
+		if (Key.isPressed(Settings.controlsSettings.respawn) && this.finishTime == null) {
 			this.respawnPressedTime = timeState.timeSinceLoad;
 			this.restart();
 			if (!this.isWatching) {
@@ -1118,15 +1118,11 @@ class MarbleWorld extends Scheduler {
 				} else {
 					Settings.levelStatistics[mission.path].respawns++;
 				}
-
-				if (this.isRecording) {
-					this.replay.endFrame();
-				}
 			}
 			return;
 		}
 
-		if (Key.isDown(Settings.controlsSettings.respawn) && !this.isWatching) {
+		if (Key.isDown(Settings.controlsSettings.respawn) && !this.isWatching && this.finishTime == null) {
 			if (timeState.timeSinceLoad - this.respawnPressedTime > 1.5) {
 				this.restart(true);
 				this.respawnPressedTime = Math.POSITIVE_INFINITY;
diff --git a/src/Replay.hx b/src/Replay.hx
index 706aa8e6..ad279189 100644
--- a/src/Replay.hx
+++ b/src/Replay.hx
@@ -258,7 +258,8 @@ class Replay {
 	}
 
 	public function endFrame() {
-		frames.push(currentRecordFrame);
+		if (currentRecordFrame != null)
+			frames.push(currentRecordFrame);
 		currentRecordFrame = null;
 	}
 
diff --git a/src/gui/GuiMLText.hx b/src/gui/GuiMLText.hx
index aff0af73..b74612d9 100644
--- a/src/gui/GuiMLText.hx
+++ b/src/gui/GuiMLText.hx
@@ -6,7 +6,6 @@ import h2d.Tile;
 import h2d.Bitmap;
 import h3d.Engine;
 import h3d.Vector;
-import shaders.GuiRender;
 import gui.GuiText.Justification;
 import h2d.HtmlText;
 import h2d.Scene;
diff --git a/src/gui/MainMenuGui.hx b/src/gui/MainMenuGui.hx
index 9e947f54..fc42c060 100644
--- a/src/gui/MainMenuGui.hx
+++ b/src/gui/MainMenuGui.hx
@@ -154,7 +154,7 @@ class MainMenuGui extends GuiImage {
 		versionText.vertSizing = Bottom;
 		versionText.position = new Vector(502, 66);
 		versionText.extent = new Vector(97, 72);
-		versionText.text.text = "<p align=\"center\">1.2.0</p>";
+		versionText.text.text = "<p align=\"center\">1.2.1</p>";
 		this.addChild(versionText);
 	}
 }