diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp
index ce5b6a74a..59e83d9e7 100644
--- a/src/p_saveg.cpp
+++ b/src/p_saveg.cpp
@@ -640,6 +640,12 @@ static void ReadOnePlayer(FSerializer &arc, bool skipload)
 					playerTemp.Serialize(arc);
 					if (!skipload)
 					{
+						// This temp player has undefined pitch limits, so set them to something
+						// that should leave the pitch stored in the savegame intact when
+						// rendering. The real pitch limits will be set by P_SerializePlayers()
+						// via a net command, but that won't be processed in time for a screen
+						// wipe, so we need something here.
+						playerTemp.MaxPitch = playerTemp.MinPitch = playerTemp.mo->Angles.Pitch;
 						CopyPlayer(&players[i], &playerTemp, name);
 					}
 					else
diff --git a/src/p_user.cpp b/src/p_user.cpp
index 450d794b6..b54a0ea62 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -65,6 +65,9 @@ static FRandom pr_skullpop ("SkullPop");
 // [RH] # of ticks to complete a turn180
 #define TURN180_TICKS	((TICRATE / 4) + 1)
 
+// [SP] Allows respawn in single player
+CVAR(Bool, sv_singleplayerrespawn, false, CVAR_SERVERINFO | CVAR_LATCH)
+
 // Variables for prediction
 CVAR (Bool, cl_noprediction, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR(Bool, cl_predict_specials, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
diff --git a/src/r_segs.cpp b/src/r_segs.cpp
index 859bc8f1b..dc8a8fb83 100644
--- a/src/r_segs.cpp
+++ b/src/r_segs.cpp
@@ -3160,7 +3160,7 @@ static void R_RenderDecal (side_t *wall, DBaseDecal *decal, drawseg_t *clipper,
 		rereadcolormap = false;
 	}
 
-	rw_light = rw_lightleft + (x1 - WallC.sx1) * rw_lightstep;
+	rw_light = rw_lightleft + (x1 - savecoord.sx1) * rw_lightstep;
 	if (fixedlightlev >= 0)
 		R_SetColorMapLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, FIXEDLIGHT2SHADE(fixedlightlev));
 	else if (fixedcolormap != NULL)