diff --git a/src/info.c b/src/info.c
index 4bc35d4c..397bdfce 100644
--- a/src/info.c
+++ b/src/info.c
@@ -60,7 +60,7 @@ char sprnames[NUMSPRITES + 1][5] =
 	"BHBM","BLIG","LIGH","THNS","SINK","SITR","KBLN","DEZL","POKE","AUDI",
 	"DECO","DOOD","SNES","GBAS","SPRS","BUZB","CHOM","SACO","CRAB","SHAD",
 	"BRNG","BUMP","FLEN","CLAS","PSHW","ISTA","ISTB","ARRO","ITEM","ITMO",
-	"ITMI","ITMN","WANT","PBOM","RETI","VIEW","KSPK","LZI1","LZI2","KLIT"
+	"ITMI","ITMN","WANT","PBOM","RETI","KSPK","LZI1","LZI2","KLIT","VIEW"
 };
 
 // Doesn't work with g++, needs actionf_p1 (don't modify this comment)
diff --git a/src/info.h b/src/info.h
index b5b12d27..152b9df0 100644
--- a/src/info.h
+++ b/src/info.h
@@ -642,14 +642,14 @@ typedef enum sprite
 
 	SPR_PBOM, // player bomb
 	SPR_RETI, // player reticule
-
-	SPR_VIEW, // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw!
 	
 	SPR_KSPK,	// Spark radius for the lightning shield
 	SPR_LZI1,	// Lightning that falls on the player for lightning shield
 	SPR_LZI2,	// ditto
 	SPR_KLIT,	// You have a twisted mind. But this actually is for the diagonal lightning.
-
+	
+	SPR_VIEW, // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw!
+	
 	SPR_FIRSTFREESLOT,
 	SPR_LASTFREESLOT = SPR_FIRSTFREESLOT + NUMSPRITEFREESLOTS - 1,
 	NUMSPRITES
diff --git a/src/k_kart.c b/src/k_kart.c
index 2f60f257..6460c94e 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2757,6 +2757,8 @@ static void K_DoThunderShield(player_t *player)
 	}
 }
 
+#undef THUNDERRADIUS
+
 static void K_DoHyudoroSteal(player_t *player)
 {
 	INT32 i, numplayers = 0;
diff --git a/src/sounds.c b/src/sounds.c
index 4ab11a28..b794045f 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -812,8 +812,8 @@ sfxinfo_t S_sfx[NUMSFX] =
   {"noooo2", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"hogbom", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"ddash",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"dbgsal", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
   {"zio3", 	 false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"dbgsal", false, 110,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
 
   // SRB2kart - Skin sounds
   {"kwin",   false,  64,  0, -1, NULL, 0,    SKSWIN,  -1, LUMPERROR},
diff --git a/src/sounds.h b/src/sounds.h
index 35b0fb53..449c50aa 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -884,8 +884,8 @@ typedef enum
 	sfx_noooo2,
 	sfx_hogbom,
 	sfx_ddash,
-	sfx_dbgsal,
 	sfx_zio3,
+	sfx_dbgsal,
 
 	sfx_kwin,
 	sfx_klose,