diff --git a/src/d_main.cpp b/src/d_main.cpp
index 46650a482..d6f53d9e4 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -93,8 +93,8 @@
 #define ASSET_HASH_TEXTURES_KART       0xb4211b2f32b6a291
 #define ASSET_HASH_CHARS_KART          0x1e68a3e01aa5c68b
 #define ASSET_HASH_MAPS_KART           0x38558ed00da41ce9
-#define ASSET_HASH_MAIN_PK3            0x0bb244e3e53dc163
-#define ASSET_HASH_MAPPATCH_PK3        0x6ad99efcfaafb70f
+#define ASSET_HASH_MAIN_PK3            0xacccb2c74bdc8d68
+#define ASSET_HASH_MAPPATCH_PK3        0x8b6a87089bb6bea4
 #define ASSET_HASH_BONUSCHARS_KART     0x60e6f13d822a7461
 #ifdef USE_PATCH_FILE
 #define ASSET_HASH_PATCH_PK3           0x0000000000000000
diff --git a/src/k_items.c b/src/k_items.c
index b03a42b66..d09cb8330 100644
--- a/src/k_items.c
+++ b/src/k_items.c
@@ -1428,10 +1428,10 @@ void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
 	// SPECIAL CASE No. 6:
 	// In battle, an SPB is forced onto players to target the "most wanted" player
 	if (K_BattleForceSPB(player)
-		&& spbplace == -1 && K_GetKartResult("spb")->cooldown == 0 && !dontforcespb
-		&& K_ItemResultEnabled(K_GetKartResult("spb")))
+		&& spbplace == -1 && K_GetKartResult("selfpropelledbomb")->cooldown == 0 && !dontforcespb
+		&& K_ItemResultEnabled(K_GetKartResult("selfpropelledbomb")))
 	{
-		K_AwardPlayerResult(player, K_GetKartResult("spb"), KITEMBLINK_KARMA);
+		K_AwardPlayerResult(player, K_GetKartResult("selfpropelledbomb"), KITEMBLINK_KARMA);
 		return;
 	}
 
@@ -1556,7 +1556,7 @@ INT32 KO_SPBRaceOdds(INT32 odds, const kartroulette_t *roulette, const kartresul
 		*forceme = 0;
 	}
 	else if (K_RaceForceSPB(roulette->playerpos, roulette->pdis)
-		&& spbplace == -1 && K_GetKartResult("spb")->cooldown == 0)
+		&& spbplace == -1 && K_GetKartResult("selfpropelledbomb")->cooldown == 0)
 	{
 		// Force SPB onto 2nd if they get too far behind.
 		*forceme = 2;