diff --git a/src/k_kart.c b/src/k_kart.c
index 477f710e..55c1802a 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3008,7 +3008,7 @@ void K_DropItems(player_t *player)
 	if (player->mo && player->kartstuff[k_itemamount])
 	{
 		mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
-		P_SetScale(drop, drop->scale>>5);
+		P_SetScale(drop, drop->scale>>4);
 		drop->destscale = (3*drop->destscale)/2;;
 
 		drop->angle = player->mo->angle + ANGLE_90;
diff --git a/src/p_inter.c b/src/p_inter.c
index c8d42b23..aab44b5f 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -445,7 +445,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 
 			P_SetTarget(&special->tracer, toucher);
 			special->flags2 |= MF2_NIGHTSPULL;
-			special->destscale = mapheaderinfo[gamemap-1]->mobj_scale>>5;
+			special->destscale = mapheaderinfo[gamemap-1]->mobj_scale>>4;
 			special->scalespeed <<= 1;
 
 			special->flags &= ~MF_SPECIAL;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 7093e781..baf0f1f2 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8031,7 +8031,7 @@ void P_MobjThinker(mobj_t *mobj)
 				if (mobj->flags2 & MF2_NIGHTSPULL)
 				{
 					if (!mobj->tracer || !mobj->tracer->health
-					|| mobj->scale <= mapheaderinfo[gamemap-1]->mobj_scale>>5)
+					|| mobj->scale <= mapheaderinfo[gamemap-1]->mobj_scale>>4)
 					{
 						P_RemoveMobj(mobj);
 						return;
diff --git a/src/r_things.c b/src/r_things.c
index 5adcecd4..dbe31cb1 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1266,7 +1266,6 @@ static void R_ProjectSprite(mobj_t *thing)
 	if (papersprite)
 	{
 		fixed_t yscale2, cosmul, sinmul, tz2;
-		INT32 range;
 
 		if (ang >= ANGLE_180)
 		{
@@ -1296,12 +1295,10 @@ static void R_ProjectSprite(mobj_t *thing)
 		if (max(tz, tz2) < FixedMul(MINZ, this_scale)) // non-papersprite clipping is handled earlier
 			return;
 
-		if (x2 > x1)
-			range = (x2 - x1);
-		else
-			range = 1;
+		if (x2 <= x1)
+			return;
 
-		scalestep = (yscale2 - yscale)/range;
+		scalestep = (yscale2 - yscale)/(x2 - x1);
 
 		// The following two are alternate sorting methods which might be more applicable in some circumstances. TODO - maybe enable via MF2?
 		// sortscale = max(yscale, yscale2);