diff --git a/src/p_floor.c b/src/p_floor.c
index 01ae011ed..48d62f6f2 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -2890,7 +2890,7 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
 
 	if (controlsec->tag != 0)
 	{
-		size_t tagline = P_FindSpecialLineFromTag(14, controlsec->tag, -1);
+		INT32 tagline = P_FindSpecialLineFromTag(14, controlsec->tag, -1);
 		if (tagline != -1)
 		{
 			if (sides[lines[tagline].sidenum[0]].toptexture)
@@ -2898,7 +2898,12 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
 			if (sides[lines[tagline].sidenum[0]].textureoffset)
 				spacing = sides[lines[tagline].sidenum[0]].textureoffset;
 			if (sides[lines[tagline].sidenum[0]].rowoffset)
-				lifetime = (sides[lines[tagline].sidenum[0]].rowoffset>>FRACBITS);
+			{
+				if (sides[lines[tagline].sidenum[0]].rowoffset>>FRACBITS == -1)
+					lifetime = (sides[lines[tagline].sidenum[0]].rowoffset>>FRACBITS);
+				else
+					lifetime = 0;
+			}
 			flags = lines[tagline].flags;
 		}
 	}
@@ -2956,8 +2961,8 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
 						P_InstaThrust(spawned, R_PointToAngle2(sec->soundorg.x, sec->soundorg.y, a, b), FixedDiv(P_AproxDistance(a - sec->soundorg.x, b - sec->soundorg.y), widthfactor));
 						P_SetObjectMomZ(spawned, FixedDiv((c - *rover->bottomheight), heightfactor), false);
 					}
-					if (lifetime != -1)
-						spawned->fuse = lifetime;
+
+					spawned->fuse = lifetime;
 				}
 			}
 		}
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 48f283bd3..c99e15cfb 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -1434,7 +1434,6 @@ static inline void SaveFrictionThinker(const thinker_t *th, const UINT8 type)
 	const friction_t *ht = (const void *)th;
 	WRITEUINT8(save_p, type);
 	WRITEINT32(save_p, ht->friction);
-	WRITEINT32(save_p, ht->movefactor);
 	WRITEINT32(save_p, ht->affectee);
 	WRITEINT32(save_p, ht->referrer);
 	WRITEUINT8(save_p, ht->roverfriction);
@@ -2369,7 +2368,6 @@ static inline void LoadFrictionThinker(actionf_p1 thinker)
 	friction_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
 	ht->thinker.function.acp1 = thinker;
 	ht->friction = READINT32(save_p);
-	ht->movefactor = READINT32(save_p);
 	ht->affectee = READINT32(save_p);
 	ht->referrer = READINT32(save_p);
 	ht->roverfriction = READUINT8(save_p);