diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 725ffd173..8ae37a308 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -741,7 +741,11 @@ static inline void CL_DrawConnectionStatus(void)
 			}
 
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-30, 0,
+#ifdef HAVE_CURL
 				va(M_GetText("%s downloading"), ((cl_mode == CL_DOWNLOADHTTPFILES) ? "\x82""HTTP" : "\x85""Direct")));
+#else
+				M_GetText("Direct downloading"));
+#endif
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-22,  MENUCAPS|V_YELLOWMAP,
 				va(M_GetText("\"%s\""), tempname));
 			V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, V_20TRANS|V_MONOSPACE,
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 0bcc4a13c..558d02cfa 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -479,6 +479,27 @@ void SV_StartSinglePlayerServer(void);
 boolean SV_SpawnServer(void);
 void SV_StopServer(void);
 void SV_ResetServer(void);
+
+/*--------------------------------------------------
+	boolean K_AddBotFromServer(UINT8 skin, UINT8 difficulty, botStyle_e style, UINT8 *newplayernum);
+
+		Adds a new bot, using a server-sided packet sent to all clients.
+		Using regular K_AddBot wherever possible is better, but this is kept
+		as a back-up measure if this is the only option.
+
+	Input Arguments:-
+		skin - Skin number that the bot will use.
+		difficulty - Difficulty level this bot will use.
+		style - Bot style to spawn this bot with, see botStyle_e.
+		newplayernum - Pointer to the last valid player slot number.
+			Is a pointer so that this function can be called multiple times to add more than one bot.
+
+	Return:-
+		true if a bot can be added via a packet later, otherwise false.
+--------------------------------------------------*/
+
+boolean K_AddBotFromServer(UINT8 skin, UINT8 difficulty, botStyle_e style, UINT8 *p);
+
 void CL_AddSplitscreenPlayer(void);
 void CL_RemoveSplitscreenPlayer(UINT8 p);
 void CL_Reset(void);
diff --git a/src/k_kart.c b/src/k_kart.c
index fd4018fcb..03758d0e1 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2720,7 +2720,7 @@ void K_KartMoveAnimation(player_t *player)
 
 		if (lookback == true)
 		{
-			statenum_t gainaxstate = S_GAINAX_TINY;
+			//statenum_t gainaxstate = S_GAINAX_TINY;
 			if (destGlanceDir == 0)
 			{
 				if (player->glanceDir != 0)
@@ -2745,10 +2745,10 @@ void K_KartMoveAnimation(player_t *player)
 			{
 				// Looking back AND glancing? Amplify the look!
 				destGlanceDir *= 2;
-				if (player->itemamount && player->itemtype)
+				/*if (player->itemamount && player->itemtype)
 					gainaxstate = S_GAINAX_HUGE;
 				else
-					gainaxstate = S_GAINAX_MID1;
+					gainaxstate = S_GAINAX_MID1;*/
 			}
 
 			/*if (destGlanceDir && !(player->pflags & PF_GAINAX))
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index 2b0a0fc46..98b783721 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -379,7 +379,7 @@ static int mobj_get(lua_State *L)
 		UINT32 flags2 = mo->flags2;
 		if (lua_compatmode && (mo->renderflags & RF_DONTDRAW) == RF_DONTDRAW)
 			flags2 |= MF2_DONTDRAW;
-		if (lua_compatmode && (mo->renderflags & RF_GHOSTLY) == RF_GHOSTLY)
+		if (lua_compatmode && (mo->renderflags & RF_GHOSTLY))
 			flags2 |= MF2_SHADOW;
 		lua_pushinteger(L, flags2);
 		break;
diff --git a/src/p_spec.c b/src/p_spec.c
index 3766999b0..17ef13105 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -4607,16 +4607,16 @@ boolean P_IsMobjTouchingSectorPlane(mobj_t *mo, sector_t *sec)
 	return P_IsMobjTouchingPlane(mo, sec, P_GetSpecialBottomZ(mo, sec, sec), P_GetSpecialTopZ(mo, sec, sec));
 }
 
-boolean P_IsMobjTouching3DFloor(mobj_t *mo, ffloor_t *ffloor, sector_t *sec)
+boolean P_IsMobjTouching3DFloor(mobj_t *mo, ffloor_t *fof, sector_t *sec)
 {
-	fixed_t topheight = P_GetSpecialTopZ(mo, sectors + ffloor->secnum, sec);
-	fixed_t bottomheight = P_GetSpecialBottomZ(mo, sectors + ffloor->secnum, sec);
+	fixed_t topheight = P_GetSpecialTopZ(mo, sectors + fof->secnum, sec);
+	fixed_t bottomheight = P_GetSpecialBottomZ(mo, sectors + fof->secnum, sec);
 
-	if (((ffloor->fofflags & FOF_BLOCKPLAYER) && mo->player)
-		|| ((ffloor->fofflags & FOF_BLOCKOTHERS) && !mo->player))
+	if (((fof->fofflags & FOF_BLOCKPLAYER) && mo->player)
+		|| ((fof->fofflags & FOF_BLOCKOTHERS) && !mo->player))
 	{
 		// Solid 3D floor: Mobj must touch the top or bottom
-		return P_IsMobjTouchingPlane(mo, ffloor->master->frontsector, topheight, bottomheight);
+		return P_IsMobjTouchingPlane(mo, fof->master->frontsector, topheight, bottomheight);
 	}
 	else
 	{
@@ -5452,6 +5452,7 @@ static void P_EvaluateLinedefExecutorTrigger(player_t *player, sector_t *sector,
 
 static void P_EvaluateOldSectorSpecial(player_t *player, sector_t *sector, sector_t *roversector, boolean isTouching)
 {
+	(void)isTouching;
 	/*switch (GETSECSPECIAL(sector->special, 1))
 	{
 		case 9: // Ring Drainer (Floor Touch)
diff --git a/src/r_plane.cpp b/src/r_plane.cpp
index cc9088256..ec3001b2e 100644
--- a/src/r_plane.cpp
+++ b/src/r_plane.cpp
@@ -944,7 +944,7 @@ void R_DrawSinglePlane(drawspandata_t *ds, visplane_t *pl, boolean allow_paralle
 	INT32 light = 0;
 	INT32 x, stop;
 	ffloor_t *rover;
-	INT32 type, spanfunctype = BASEDRAWFUNC;
+	INT32 spanfunctype = BASEDRAWFUNC;
 	debugrender_highlight_t debug = debugrender_highlight_t::SW_HI_PLANES;
 	void (*mapfunc)(drawspandata_t*, void(*)(drawspandata_t*), INT32, INT32, INT32, boolean) = R_MapPlane;
 	INT16 highlight = R_PlaneIsHighlighted(pl);
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 43a771df1..df6cfbed2 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -279,13 +279,13 @@ get_real_sfx_volume (int vol)
 
 // this is as fast as I can possibly make it.
 // sorry. more asm needed.
-static Mix_Chunk *ds2chunk(void *stream)
+static Mix_Chunk *ds2chunk(void const *stream)
 {
 	UINT16 ver,freq;
 	UINT32 samples, i, newsamples;
 	UINT8 *sound;
 
-	SINT8 *s;
+	const SINT8 *s;
 	INT16 *d;
 	INT16 o;
 	fixed_t step, frac;
@@ -327,7 +327,7 @@ static Mix_Chunk *ds2chunk(void *stream)
 	}
 	sound = Z_Malloc(newsamples<<2, PU_SOUND, NULL); // samples * frequency shift * bytes per sample * channels
 
-	s = (SINT8 *)stream;
+	s = (const SINT8 *)stream;
 	d = (INT16 *)sound;
 
 	i = 0;