diff --git a/patches/server/Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
index 45a8e53363..3e1e2807fa 100644
--- a/patches/server/Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
+++ b/patches/server/Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
@@ -44,5 +44,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            this.queue = null;
 +            // Paper end
              Runnable task;
-             while ((task = this.queue.poll()) != null) {
+-            while ((task = this.queue.poll()) != null) {
++            while ((task = queue.poll()) != null) { // Paper
                  task.run();
+             }
+         }
diff --git a/patches/server/implement-optional-per-player-mob-spawns.patch b/patches/server/implement-optional-per-player-mob-spawns.patch
index a418fe00e6..0b49db722e 100644
--- a/patches/server/implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/implement-optional-per-player-mob-spawns.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +            gone.remove(player);
 +
-+            final SectionPos newPosition = player.getPlayerMapSection();
++            final SectionPos newPosition = player.getLastSectionPos();
 +            final SectionPos oldPosition = this.players.put(player, newPosition);
 +
 +            if (oldPosition == null) {
@@ -117,7 +117,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        int expectedEntries = (2 * viewDistance + 1);
 +        expectedEntries *= expectedEntries;
 +
-+        final SectionPos currPosition = player.getPlayerMapSection();
++        final SectionPos currPosition = player.getLastSectionPos();
 +
 +        final int centerX = currPosition.getX();
 +        final int centerZ = currPosition.getZ();