diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 38edabc5..395ad118 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,7 +41,7 @@ jobs:
           mv sm/addons/sourcemod/scripting/gokz-*.smx addons/sourcemod/plugins
           
       - name: upload-full
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: GOKZ-v${{ env.GOKZ_VERSION }}
           path: |
@@ -56,7 +56,7 @@ jobs:
             !*.fgd
           
       - name: upload-upgrade
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: GOKZ-v${{ env.GOKZ_VERSION }}-upgrade
           path: |
diff --git a/addons/sourcemod/scripting/gokz-mode-kztimer.sp b/addons/sourcemod/scripting/gokz-mode-kztimer.sp
index b268540b..60765bde 100644
--- a/addons/sourcemod/scripting/gokz-mode-kztimer.sp
+++ b/addons/sourcemod/scripting/gokz-mode-kztimer.sp
@@ -29,7 +29,7 @@ public Plugin myinfo =
 
 #define UPDATER_URL GOKZ_UPDATER_BASE_URL..."gokz-mode-kztimer.txt"
 
-#define MODE_VERSION 2170
+#define MODE_VERSION 2171
 #define DUCK_SPEED_NORMAL 8.0
 #define PRE_VELMOD_MAX 1.104 // Calculated 276/250
 #define PERF_SPEED_CAP 380.0
diff --git a/addons/sourcemod/scripting/gokz-mode-simplekz.sp b/addons/sourcemod/scripting/gokz-mode-simplekz.sp
index e4db09cf..a0ffed2c 100644
--- a/addons/sourcemod/scripting/gokz-mode-simplekz.sp
+++ b/addons/sourcemod/scripting/gokz-mode-simplekz.sp
@@ -29,7 +29,7 @@ public Plugin myinfo =
 
 #define UPDATER_URL GOKZ_UPDATER_BASE_URL..."gokz-mode-simplekz.txt"
 
-#define MODE_VERSION 210
+#define MODE_VERSION 211
 #define PS_MAX_REWARD_TURN_RATE 0.703125 // Degrees per tick (90 degrees per second)
 #define PS_MAX_TURN_RATE_DECREMENT 0.015625 // Degrees per tick (2 degrees per second)
 #define PS_SPEED_MAX 26.54321 // Units
diff --git a/addons/sourcemod/scripting/gokz-mode-vanilla.sp b/addons/sourcemod/scripting/gokz-mode-vanilla.sp
index 6fb99fb4..dca2118e 100644
--- a/addons/sourcemod/scripting/gokz-mode-vanilla.sp
+++ b/addons/sourcemod/scripting/gokz-mode-vanilla.sp
@@ -29,7 +29,7 @@ public Plugin myinfo =
 
 #define UPDATER_URL GOKZ_UPDATER_BASE_URL..."gokz-mode-vanilla.txt"
 
-#define MODE_VERSION 170
+#define MODE_VERSION 171
 
 float gF_ModeCVarValues[MODECVAR_COUNT] = 
 {
diff --git a/addons/sourcemod/scripting/gokz-saveloc.sp b/addons/sourcemod/scripting/gokz-saveloc.sp
index 9db3aa67..454dd136 100644
--- a/addons/sourcemod/scripting/gokz-saveloc.sp
+++ b/addons/sourcemod/scripting/gokz-saveloc.sp
@@ -121,8 +121,10 @@ enum struct Location {
 		GOKZ_SetTeleportCount(client, this.teleportCount);
 		GOKZ_SetUndoTeleportData(client, this.undoTeleportData, GOKZ_CHECKPOINT_VERSION);
 
+		int flagsMask = ~(FL_CLIENT | FL_FAKECLIENT | FL_GODMODE | FL_NOTARGET | FL_AIMTARGET);
+		SetEntityFlags(client, (this.flags & flagsMask) | (GetEntityFlags(client) & ~flagsMask));
+
 		SetEntPropEnt(client, Prop_Data, "m_hGroundEntity", this.groundEnt);
-		SetEntityFlags(client, this.flags);
 		TeleportEntity(client, this.position, this.angles, this.velocity);
 		SetEntPropFloat(client, Prop_Send, "m_flDuckAmount", this.duckAmount);
 		SetEntProp(client, Prop_Send, "m_bDucking", this.ducking);