diff --git a/addons/sourcemod/configs/shavit-replay.cfg b/addons/sourcemod/configs/shavit-replay.cfg
index 9c66d1be..5c8a7171 100644
--- a/addons/sourcemod/configs/shavit-replay.cfg
+++ b/addons/sourcemod/configs/shavit-replay.cfg
@@ -55,7 +55,7 @@
 		{
 			"enabled"             "1"
 			"tracks"              "0"
-			"styles"              "1;2;3;4;5;6;8;9;10;11;12;13;14;15;16"
+			"styles"              "1;2;3;4;5;6;8;9;11;12;13;14;15;16"
 		}
 		"Bonus Normal Bot"
 		{
diff --git a/addons/sourcemod/scripting/include/shavit/checkpoints-cross-map.sp b/addons/sourcemod/scripting/include/shavit/checkpoints-cross-map.sp
deleted file mode 100644
index e69de29b..00000000
diff --git a/addons/sourcemod/scripting/include/shavit/replay-bot-path.sp b/addons/sourcemod/scripting/include/shavit/replay-bot-path.sp
deleted file mode 100644
index e69de29b..00000000
diff --git a/addons/sourcemod/scripting/include/shavit/tas-oblivious.inc b/addons/sourcemod/scripting/include/shavit/tas-oblivious.inc
index ad4cbc47..ddf78bbb 100644
--- a/addons/sourcemod/scripting/include/shavit/tas-oblivious.inc
+++ b/addons/sourcemod/scripting/include/shavit/tas-oblivious.inc
@@ -209,8 +209,8 @@ stock Action ObliviousOnPlayerRunCmd(int client, int& buttons, int& impulse, flo
 	{
 		addspeed = addspeed - _addspeed;
 
-		if (addspeed > 30.0)
-			addspeed = 30.0;
+		if (addspeed > flAirSpeedCap)
+			addspeed = flAirSpeedCap;
 	}
 
 	if (buttons & IN_DUCK)
diff --git a/addons/sourcemod/scripting/include/shavit/zones.inc b/addons/sourcemod/scripting/include/shavit/zones.inc
index c896bb32..3ce57ec0 100644
--- a/addons/sourcemod/scripting/include/shavit/zones.inc
+++ b/addons/sourcemod/scripting/include/shavit/zones.inc
@@ -273,6 +273,7 @@ native void Shavit_SetStart(int client, int track, bool anglesonly);
  */
 native void Shavit_DeleteSetStart(int client, int track);
 
+#if 0
 native void Shavit_RemoveAllZones();
 
 native int Shavit_GetZoneCount();
@@ -280,6 +281,7 @@ native int Shavit_GetZoneCount();
 native void Shavit_GetZone(int index, any[] zonecache, int size = sizeof(zone_cache_t));
 
 native int Shavit_AddZone(any[] zonecache, int size = sizeof(zone_cache_t));
+#endif
 
 public SharedPlugin __pl_shavit_zones =
 {
diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
index b2cc578d..015b2967 100644
--- a/addons/sourcemod/scripting/shavit-core.sp
+++ b/addons/sourcemod/scripting/shavit-core.sp
@@ -1754,6 +1754,7 @@ public Action Shavit_OnFinishPre(int client, timer_snapshot_t snapshot)
 	if (snapshot.fCurrentTime < minimum_time)
 	{
 		Shavit_PrintToChat(client, "%T", "TimeUnderMinimumTime", client, minimum_time, snapshot.fCurrentTime, snapshot.iTimerTrack == Track_Main ? "minimum_time" : "minimum_time_bonus");
+		StopTimer(client);
 		return Plugin_Stop;
 	}
 
@@ -2824,7 +2825,11 @@ public MRESReturn DHook_ProcessMovement(Handle hParams)
 
 	if (gA_Timers[client].fTimescale == 1.0 || mt == MOVETYPE_NOCLIP)
 	{
-		SetClientEventsPaused(client, gA_Timers[client].bClientPaused);
+		if (gB_Eventqueuefix)
+		{
+			SetClientEventsPaused(client, gA_Timers[client].bClientPaused);
+		}
+
 		return MRES_Ignored;
 	}