diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 4d7abd7a2..9c93eb8fc 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -1313,7 +1313,7 @@ First, edit `UsedSurfScript` in [engine/events/overworld.asm](https://github.com
 
  	callasm .empty_fn ; empty function
 
- 	readmem wBuffer2
+ 	readmem wSurfingPlayerState
  	writevar VAR_MOVEMENT
 
  	special UpdatePlayerSprite
diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm
index 3da57db2b..ab8dd3ca0 100644
--- a/engine/events/kurt.asm
+++ b/engine/events/kurt.asm
@@ -87,7 +87,7 @@ Kurt_SelectApricorn:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 7 ; rows, columns
 	db SCROLLINGMENU_ITEMS_NORMAL ; item format
-	dbw 0, wBuffer1
+	dbw 0, wKurtApricornCount
 	dba .Name
 	dba .Quantity
 	dba NULL
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index b22302ec5..ec5432621 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -1870,7 +1870,7 @@ Mobile_MoveSelectionScreen:
 	ld bc, NUM_MOVES
 	call CopyBytes
 	ld a, SCREEN_WIDTH * 2
-	ld [wBuffer1], a
+	ld [wListMovesLineSpacing], a
 	hlcoord 2, 10
 	predef ListMoves
 	ret
diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm
index c782087cf..121c38fda 100644
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -37,7 +37,7 @@ StubbedTrainerRankings_MagikarpLength:
 	ret
 	ld a, BANK(sTrainerRankingLongestMagikarp)
 	call OpenSRAM
-	ld de, wBuffer1
+	ld de, wMagikarpLength
 	ld hl, sTrainerRankingLongestMagikarp
 
 	; Is this Magikarp the longest measured?