diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRace.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRace.java
index 2bad52a..1dfffc5 100644
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRace.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/elytraRace/ElytraRace.java
@@ -133,7 +133,7 @@ public class ElytraRace extends StatelessGame {
             return;
         }
 
-        this.playerCheckpoints.putIfAbsent(player, new CheckPointData(this.ringSpacing, this.ringSpacing * 2));
+        this.playerCheckpoints.putIfAbsent(player, new CheckPointData(0, this.ringSpacing));
 
         if(newPos.z() > this.generatedUntil - this.ringSpacing) {
             this.generateRing(this.generatedUntil + this.ringSpacing);
@@ -224,7 +224,9 @@ public class ElytraRace extends StatelessGame {
     }
 
     private void toCheckpoint(Player p) {
+        CheckPointData data = this.playerCheckpoints.get(p);
         Point checkpointPos = this.getRingPositionAtZ(this.playerCheckpoints.get(p).currentCheckpoint);
+        if(data.currentCheckpoint == 0) checkpointPos = this.getSpawn().add(0, 3, 0);
         p.setVelocity(Vec.ZERO);
         p.setFlyingWithElytra(false);
         p.teleport(Pos.fromPoint(checkpointPos).add(0.5, 0, 0.5));
diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java
index b3f8711..ea1e1c4 100644
--- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/stickfight/Stickfight.java
@@ -122,6 +122,7 @@ public class Stickfight extends StatelessGame {
             player.teleport(this.spawnPoints.get(player));
             this.scoreMap.putIfAbsent(player, 0);
             this.scoreMap.put(player, this.scoreMap.get(player) + 1);
+            player.setLevel(this.scoreMap.get(player));
         }
     }